diff --git a/Cargo.lock b/Cargo.lock index a6a0c5cc98..b5e6bd072e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1979,7 +1979,6 @@ dependencies = [ "miden-mast-package", "miden-package-registry", "miden-processor", - "miden-project", "miden-protocol", "miden-utils-sync", "miden-verifier", diff --git a/Cargo.toml b/Cargo.toml index de023fce2a..735135a56f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,6 @@ 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" } diff --git a/crates/miden-protocol/Cargo.toml b/crates/miden-protocol/Cargo.toml index f5a4b49fec..2775fb5d9b 100644 --- a/crates/miden-protocol/Cargo.toml +++ b/crates/miden-protocol/Cargo.toml @@ -76,7 +76,6 @@ miden-core = { workspace = true } miden-core-lib = { workspace = true } miden-mast-package = { features = ["std"], workspace = true } miden-package-registry = { features = ["std"], workspace = true } -miden-project = { features = ["std"], workspace = true } regex = { workspace = true } walkdir = { workspace = true } diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/account.masm b/crates/miden-protocol/asm/kernels/transaction-core/account.masm similarity index 98% rename from crates/miden-protocol/asm/kernels/transaction/lib/account.masm rename to crates/miden-protocol/asm/kernels/transaction-core/account.masm index 5abdf57104..8778016f31 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/account.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/account.masm @@ -1,19 +1,19 @@ -use $kernel::account_update +use miden::tx_kernel_core::account_update use miden::protocol_utils::account_id -use $kernel::asset_vault -use $kernel::callbacks -use $kernel::callbacks::ON_BEFORE_ASSET_ADDED_TO_ACCOUNT_PROC_ROOT_SLOT -use $kernel::callbacks::ON_BEFORE_ASSET_ADDED_TO_NOTE_PROC_ROOT_SLOT -use $kernel::constants::ACCOUNT_PROCEDURE_DATA_LENGTH -use $kernel::constants::EMPTY_SMT_ROOT -use $kernel::constants::STORAGE_SLOT_TYPE_MAP -use $kernel::constants::STORAGE_SLOT_TYPE_VALUE -use $kernel::memory -use $kernel::memory::ACCT_ID_SUFFIX_OFFSET -use $kernel::memory::ACCT_ID_PREFIX_OFFSET -use $kernel::memory::ACCOUNT_DATA_LENGTH -use $kernel::memory::MAX_FOREIGN_ACCOUNT_PTR -use $kernel::memory::NATIVE_ACCOUNT_DATA_PTR +use miden::tx_kernel_core::asset_vault +use miden::tx_kernel_core::callbacks +use miden::tx_kernel_core::callbacks::ON_BEFORE_ASSET_ADDED_TO_ACCOUNT_PROC_ROOT_SLOT +use miden::tx_kernel_core::callbacks::ON_BEFORE_ASSET_ADDED_TO_NOTE_PROC_ROOT_SLOT +use miden::tx_kernel_core::constants::ACCOUNT_PROCEDURE_DATA_LENGTH +use miden::tx_kernel_core::constants::EMPTY_SMT_ROOT +use miden::tx_kernel_core::constants::STORAGE_SLOT_TYPE_MAP +use miden::tx_kernel_core::constants::STORAGE_SLOT_TYPE_VALUE +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::memory::ACCT_ID_SUFFIX_OFFSET +use miden::tx_kernel_core::memory::ACCT_ID_PREFIX_OFFSET +use miden::tx_kernel_core::memory::ACCOUNT_DATA_LENGTH +use miden::tx_kernel_core::memory::MAX_FOREIGN_ACCOUNT_PTR +use miden::tx_kernel_core::memory::NATIVE_ACCOUNT_DATA_PTR use miden::core::collections::smt use miden::core::collections::sorted_array use miden::core::crypto::hashes::poseidon2 diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/account_update.masm b/crates/miden-protocol/asm/kernels/transaction-core/account_update.masm similarity index 98% rename from crates/miden-protocol/asm/kernels/transaction/lib/account_update.masm rename to crates/miden-protocol/asm/kernels/transaction-core/account_update.masm index ca0439a829..df4d6311ba 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/account_update.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/account_update.masm @@ -1,11 +1,11 @@ -use $kernel::account -use $kernel::asset -use $kernel::asset::COMPOSITION_NONE -use $kernel::constants::STORAGE_SLOT_TYPE_VALUE -use $kernel::asset::ASSET_SIZE -use $kernel::link_map -use $kernel::memory -use $kernel::memory::ACCOUNT_UPDATE_ASSET_PTR +use miden::tx_kernel_core::account +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::asset::COMPOSITION_NONE +use miden::tx_kernel_core::constants::STORAGE_SLOT_TYPE_VALUE +use miden::tx_kernel_core::asset::ASSET_SIZE +use miden::tx_kernel_core::link_map +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::memory::ACCOUNT_UPDATE_ASSET_PTR use miden::core::crypto::hashes::poseidon2 use miden::core::word diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/asset.masm b/crates/miden-protocol/asm/kernels/transaction-core/asset.masm similarity index 99% rename from crates/miden-protocol/asm/kernels/transaction/lib/asset.masm rename to crates/miden-protocol/asm/kernels/transaction-core/asset.masm index b711f9401e..04762d2d83 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/asset.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/asset.masm @@ -1,6 +1,6 @@ use miden::protocol_utils::account_id -use $kernel::fungible_asset -use $kernel::non_fungible_asset +use miden::tx_kernel_core::fungible_asset +use miden::tx_kernel_core::non_fungible_asset use miden::protocol_utils::asset->asset_utils # ERRORS diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/asset_vault.masm b/crates/miden-protocol/asm/kernels/transaction-core/asset_vault.masm similarity index 99% rename from crates/miden-protocol/asm/kernels/transaction/lib/asset_vault.masm rename to crates/miden-protocol/asm/kernels/transaction-core/asset_vault.masm index 8dc5cca9fa..d5e2133098 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/asset_vault.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/asset_vault.masm @@ -1,9 +1,9 @@ use miden::core::collections::smt use miden::core::crypto::hashes::poseidon2 -use $kernel::asset -use $kernel::fungible_asset -use $kernel::non_fungible_asset +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::fungible_asset +use miden::tx_kernel_core::non_fungible_asset # ERRORS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/callbacks.masm b/crates/miden-protocol/asm/kernels/transaction-core/callbacks.masm similarity index 99% rename from crates/miden-protocol/asm/kernels/transaction/lib/callbacks.masm rename to crates/miden-protocol/asm/kernels/transaction-core/callbacks.masm index 6414247efe..e704b2e594 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/callbacks.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/callbacks.masm @@ -1,6 +1,6 @@ -use $kernel::tx -use $kernel::asset -use $kernel::account +use miden::tx_kernel_core::tx +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::account use miden::protocol_utils::account_id use miden::core::word diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/constants.masm b/crates/miden-protocol/asm/kernels/transaction-core/constants.masm similarity index 100% rename from crates/miden-protocol/asm/kernels/transaction/lib/constants.masm rename to crates/miden-protocol/asm/kernels/transaction-core/constants.masm diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/epilogue.masm b/crates/miden-protocol/asm/kernels/transaction-core/epilogue.masm similarity index 97% rename from crates/miden-protocol/asm/kernels/transaction/lib/epilogue.masm rename to crates/miden-protocol/asm/kernels/transaction-core/epilogue.masm index 09754389a3..0764005f89 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/epilogue.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/epilogue.masm @@ -1,13 +1,13 @@ -use $kernel::account -use $kernel::account_update -use $kernel::asset -use $kernel::asset::ASSET_SIZE -use $kernel::asset_vault -use $kernel::constants::NOTE_MEM_SIZE -use $kernel::memory -use $kernel::memory::OUTPUT_NOTE_SECTION_OFFSET -use $kernel::memory::OUTPUT_VAULT_ROOT_PTR -use $kernel::note +use miden::tx_kernel_core::account +use miden::tx_kernel_core::account_update +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::asset::ASSET_SIZE +use miden::tx_kernel_core::asset_vault +use miden::tx_kernel_core::constants::NOTE_MEM_SIZE +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::memory::OUTPUT_NOTE_SECTION_OFFSET +use miden::tx_kernel_core::memory::OUTPUT_VAULT_ROOT_PTR +use miden::tx_kernel_core::note use miden::core::crypto::hashes::poseidon2 use miden::core::word diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/faucet.masm b/crates/miden-protocol/asm/kernels/transaction-core/faucet.masm similarity index 96% rename from crates/miden-protocol/asm/kernels/transaction/lib/faucet.masm rename to crates/miden-protocol/asm/kernels/transaction-core/faucet.masm index b0117c0d24..b34bf1fa4e 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/faucet.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/faucet.masm @@ -1,9 +1,9 @@ -use $kernel::account -use $kernel::asset -use $kernel::asset_vault -use $kernel::fungible_asset -use $kernel::non_fungible_asset -use $kernel::memory::INPUT_VAULT_ROOT_PTR +use miden::tx_kernel_core::account +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::asset_vault +use miden::tx_kernel_core::fungible_asset +use miden::tx_kernel_core::non_fungible_asset +use miden::tx_kernel_core::memory::INPUT_VAULT_ROOT_PTR # FUNGIBLE ASSETS # ================================================================================================== diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/fungible_asset.masm b/crates/miden-protocol/asm/kernels/transaction-core/fungible_asset.masm similarity index 99% rename from crates/miden-protocol/asm/kernels/transaction/lib/fungible_asset.masm rename to crates/miden-protocol/asm/kernels/transaction-core/fungible_asset.masm index 6333058292..161728744d 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/fungible_asset.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/fungible_asset.masm @@ -2,7 +2,7 @@ use miden::protocol_utils::account_id use miden::protocol_utils::asset::FUNGIBLE_ASSET_MAX_AMOUNT -use $kernel::asset +use miden::tx_kernel_core::asset # RE-EXPORTS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/input_note.masm b/crates/miden-protocol/asm/kernels/transaction-core/input_note.masm similarity index 98% rename from crates/miden-protocol/asm/kernels/transaction/lib/input_note.masm rename to crates/miden-protocol/asm/kernels/transaction-core/input_note.masm index dd247047ce..44e421bae1 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/input_note.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/input_note.masm @@ -1,4 +1,4 @@ -use $kernel::memory +use miden::tx_kernel_core::memory # ERRORS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/link_map.masm b/crates/miden-protocol/asm/kernels/transaction-core/link_map.masm similarity index 99% rename from crates/miden-protocol/asm/kernels/transaction/lib/link_map.masm rename to crates/miden-protocol/asm/kernels/transaction-core/link_map.masm index 39876016c3..95ab44cd32 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/link_map.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/link_map.masm @@ -1,8 +1,8 @@ use miden::core::word -use $kernel::memory -use $kernel::memory::LINK_MAP_ENTRY_SIZE -use $kernel::memory::LINK_MAP_REGION_END_PTR -use $kernel::memory::LINK_MAP_REGION_START_PTR +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::memory::LINK_MAP_ENTRY_SIZE +use miden::tx_kernel_core::memory::LINK_MAP_REGION_END_PTR +use miden::tx_kernel_core::memory::LINK_MAP_REGION_START_PTR # A link map is a map data structure based on a sorted linked list. # diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/memory.masm b/crates/miden-protocol/asm/kernels/transaction-core/memory.masm similarity index 99% rename from crates/miden-protocol/asm/kernels/transaction/lib/memory.masm rename to crates/miden-protocol/asm/kernels/transaction-core/memory.masm index 8369638ebc..4272ad4659 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/memory.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/memory.masm @@ -1,7 +1,7 @@ -use $kernel::constants::ACCOUNT_PROCEDURE_DATA_LENGTH -use $kernel::constants::MAX_ASSETS_PER_NOTE -use $kernel::constants::NOTE_MEM_SIZE -use $kernel::constants::WORD_NUM_ELEMENTS +use miden::tx_kernel_core::constants::ACCOUNT_PROCEDURE_DATA_LENGTH +use miden::tx_kernel_core::constants::MAX_ASSETS_PER_NOTE +use miden::tx_kernel_core::constants::NOTE_MEM_SIZE +use miden::tx_kernel_core::constants::WORD_NUM_ELEMENTS use miden::core::mem pub type AccountId = struct { prefix: felt, suffix: felt } diff --git a/crates/miden-protocol/asm/kernels/transaction-core/miden-project.toml b/crates/miden-protocol/asm/kernels/transaction-core/miden-project.toml new file mode 100644 index 0000000000..667c5d0f87 --- /dev/null +++ b/crates/miden-protocol/asm/kernels/transaction-core/miden-project.toml @@ -0,0 +1,11 @@ +[package] +name = "miden-tx-kernel-core" +version.workspace = true + +[lib] +namespace = "miden::tx_kernel_core" +path = "mod.masm" + +[dependencies] +miden-core.workspace = true +miden-protocol-utils.workspace = true diff --git a/crates/miden-protocol/asm/kernels/transaction-core/mod.masm b/crates/miden-protocol/asm/kernels/transaction-core/mod.masm new file mode 100644 index 0000000000..ac144d7d5e --- /dev/null +++ b/crates/miden-protocol/asm/kernels/transaction-core/mod.masm @@ -0,0 +1,5 @@ +#! Root module of the `miden::tx_kernel_core` library. +#! +#! This library holds the internal implementation modules of the transaction kernel (prologue, +#! epilogue, note processing, account, asset, memory, etc.). They are not part of the kernel's +#! public syscall API (defined in the `tx-kernel` library's `api.masm`). diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/non_fungible_asset.masm b/crates/miden-protocol/asm/kernels/transaction-core/non_fungible_asset.masm similarity index 99% rename from crates/miden-protocol/asm/kernels/transaction/lib/non_fungible_asset.masm rename to crates/miden-protocol/asm/kernels/transaction-core/non_fungible_asset.masm index 4d7b190476..48a6f84b65 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/non_fungible_asset.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/non_fungible_asset.masm @@ -1,5 +1,5 @@ use miden::protocol_utils::account_id -use $kernel::asset +use miden::tx_kernel_core::asset # ERRORS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/note.masm b/crates/miden-protocol/asm/kernels/transaction-core/note.masm similarity index 98% rename from crates/miden-protocol/asm/kernels/transaction/lib/note.masm rename to crates/miden-protocol/asm/kernels/transaction-core/note.masm index 2f83d937bf..04f62d2a97 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/note.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/note.masm @@ -1,9 +1,9 @@ use miden::core::crypto::hashes::poseidon2 -use $kernel::asset::ASSET_SIZE -use $kernel::constants::NOTE_MEM_SIZE -use $kernel::constants::WORD_NUM_ELEMENTS -use $kernel::memory +use miden::tx_kernel_core::asset::ASSET_SIZE +use miden::tx_kernel_core::constants::NOTE_MEM_SIZE +use miden::tx_kernel_core::constants::WORD_NUM_ELEMENTS +use miden::tx_kernel_core::memory pub use miden::protocol_utils::note::NOTE_TYPE_PUBLIC pub use miden::protocol_utils::note::NOTE_TYPE_PRIVATE diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/output_note.masm b/crates/miden-protocol/asm/kernels/transaction-core/output_note.masm similarity index 97% rename from crates/miden-protocol/asm/kernels/transaction/lib/output_note.masm rename to crates/miden-protocol/asm/kernels/transaction-core/output_note.masm index ec0d47ebf2..1ceb6896f8 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/output_note.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/output_note.masm @@ -1,18 +1,18 @@ -use $kernel::account -use $kernel::asset -use $kernel::callbacks -use $kernel::fungible_asset -use $kernel::memory -use $kernel::note -use $kernel::note::NOTE_TYPE_PUBLIC -use $kernel::note::MAX_ATTACHMENT_SCHEME -use $kernel::note::MAX_ATTACHMENT_WORDS -use $kernel::note::MAX_ATTACHMENT_TOTAL_WORDS -use $kernel::constants::MAX_OUTPUT_NOTES_PER_TX -use $kernel::constants::WORD_NUM_ELEMENTS -use $kernel::note::NOTE_METADATA_VERSION_1 -use $kernel::asset::ASSET_SIZE -use $kernel::asset::ASSET_VALUE_MEMORY_OFFSET +use miden::tx_kernel_core::account +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::callbacks +use miden::tx_kernel_core::fungible_asset +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::note +use miden::tx_kernel_core::note::NOTE_TYPE_PUBLIC +use miden::tx_kernel_core::note::MAX_ATTACHMENT_SCHEME +use miden::tx_kernel_core::note::MAX_ATTACHMENT_WORDS +use miden::tx_kernel_core::note::MAX_ATTACHMENT_TOTAL_WORDS +use miden::tx_kernel_core::constants::MAX_OUTPUT_NOTES_PER_TX +use miden::tx_kernel_core::constants::WORD_NUM_ELEMENTS +use miden::tx_kernel_core::note::NOTE_METADATA_VERSION_1 +use miden::tx_kernel_core::asset::ASSET_SIZE +use miden::tx_kernel_core::asset::ASSET_VALUE_MEMORY_OFFSET use miden::core::word use miden::core::mem diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/prologue.masm b/crates/miden-protocol/asm/kernels/transaction-core/prologue.masm similarity index 98% rename from crates/miden-protocol/asm/kernels/transaction/lib/prologue.masm rename to crates/miden-protocol/asm/kernels/transaction-core/prologue.masm index 71bcb1d762..5263a67c6a 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/prologue.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/prologue.masm @@ -3,21 +3,21 @@ use miden::core::collections::mmr use miden::core::crypto::hashes::poseidon2 use miden::core::word -use $kernel::account +use miden::tx_kernel_core::account use miden::protocol_utils::account_id -use $kernel::asset_vault -use $kernel::asset::ASSET_SIZE -use $kernel::asset -use $kernel::constants::EMPTY_SMT_ROOT -use $kernel::constants::MAX_ASSETS_PER_NOTE -use $kernel::constants::MAX_INPUT_NOTES_PER_TX -use $kernel::constants::MAX_NOTE_STORAGE_ITEMS -use $kernel::constants::NOTE_TREE_DEPTH -use $kernel::memory -use $kernel::memory::BLOCK_DATA_SECTION_OFFSET -use $kernel::memory::INPUT_VAULT_ROOT_PTR -use $kernel::memory::KERNEL_PROCEDURES_PTR -use $kernel::memory::PARTIAL_BLOCKCHAIN_PTR +use miden::tx_kernel_core::asset_vault +use miden::tx_kernel_core::asset::ASSET_SIZE +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::constants::EMPTY_SMT_ROOT +use miden::tx_kernel_core::constants::MAX_ASSETS_PER_NOTE +use miden::tx_kernel_core::constants::MAX_INPUT_NOTES_PER_TX +use miden::tx_kernel_core::constants::MAX_NOTE_STORAGE_ITEMS +use miden::tx_kernel_core::constants::NOTE_TREE_DEPTH +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::memory::BLOCK_DATA_SECTION_OFFSET +use miden::tx_kernel_core::memory::INPUT_VAULT_ROOT_PTR +use miden::tx_kernel_core::memory::KERNEL_PROCEDURES_PTR +use miden::tx_kernel_core::memory::PARTIAL_BLOCKCHAIN_PTR # CONSTS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/tx.masm b/crates/miden-protocol/asm/kernels/transaction-core/tx.masm similarity index 98% rename from crates/miden-protocol/asm/kernels/transaction/lib/tx.masm rename to crates/miden-protocol/asm/kernels/transaction-core/tx.masm index fe49d70823..07bc7bef36 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/tx.masm +++ b/crates/miden-protocol/asm/kernels/transaction-core/tx.masm @@ -1,6 +1,6 @@ -use $kernel::account -use $kernel::memory -use $kernel::note +use miden::tx_kernel_core::account +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::note # CONSTANTS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/main.masm b/crates/miden-protocol/asm/kernels/transaction/bin/main.masm similarity index 97% rename from crates/miden-protocol/asm/kernels/transaction/main.masm rename to crates/miden-protocol/asm/kernels/transaction/bin/main.masm index c11a29f202..0bc89118a9 100644 --- a/crates/miden-protocol/asm/kernels/transaction/main.masm +++ b/crates/miden-protocol/asm/kernels/transaction/bin/main.masm @@ -1,10 +1,10 @@ use miden::core::word -use $kernel::epilogue -use $kernel::memory -use $kernel::memory::TX_SCRIPT_ROOT_PTR -use $kernel::note -use $kernel::prologue +use miden::tx_kernel_core::epilogue +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::memory::TX_SCRIPT_ROOT_PTR +use miden::tx_kernel_core::note +use miden::tx_kernel_core::prologue # EVENTS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/tx_script_main.masm b/crates/miden-protocol/asm/kernels/transaction/bin/tx_script_main.masm similarity index 96% rename from crates/miden-protocol/asm/kernels/transaction/tx_script_main.masm rename to crates/miden-protocol/asm/kernels/transaction/bin/tx_script_main.masm index 958427842c..a87ef21dd9 100644 --- a/crates/miden-protocol/asm/kernels/transaction/tx_script_main.masm +++ b/crates/miden-protocol/asm/kernels/transaction/bin/tx_script_main.masm @@ -1,7 +1,7 @@ use miden::core::word -use $kernel::memory::TX_SCRIPT_ROOT_PTR -use $kernel::prologue +use miden::tx_kernel_core::memory::TX_SCRIPT_ROOT_PTR +use miden::tx_kernel_core::prologue # ERRORS # ================================================================================================= diff --git a/crates/miden-protocol/asm/kernels/transaction/lib/api.masm b/crates/miden-protocol/asm/kernels/transaction/lib/api.masm index fbe2af13a0..c1cc17032f 100644 --- a/crates/miden-protocol/asm/kernels/transaction/lib/api.masm +++ b/crates/miden-protocol/asm/kernels/transaction/lib/api.masm @@ -1,16 +1,16 @@ -use $kernel::asset -use $kernel::account -use $kernel::account_update +use miden::tx_kernel_core::asset +use miden::tx_kernel_core::account +use miden::tx_kernel_core::account_update use miden::protocol_utils::account_id -use $kernel::faucet -use $kernel::input_note -use $kernel::memory -use $kernel::output_note -use $kernel::tx - -use $kernel::memory::UPCOMING_FOREIGN_PROCEDURE_PTR -use $kernel::memory::UPCOMING_FOREIGN_PROC_INPUT_VALUE_15_PTR -use $kernel::memory::KERNEL_PROCEDURES_PTR +use miden::tx_kernel_core::faucet +use miden::tx_kernel_core::input_note +use miden::tx_kernel_core::memory +use miden::tx_kernel_core::output_note +use miden::tx_kernel_core::tx + +use miden::tx_kernel_core::memory::UPCOMING_FOREIGN_PROCEDURE_PTR +use miden::tx_kernel_core::memory::UPCOMING_FOREIGN_PROC_INPUT_VALUE_15_PTR +use miden::tx_kernel_core::memory::KERNEL_PROCEDURES_PTR use miden::core::word diff --git a/crates/miden-protocol/asm/kernels/transaction/miden-project.toml b/crates/miden-protocol/asm/kernels/transaction/miden-project.toml index 1b7d9d377d..d1cdba7200 100644 --- a/crates/miden-protocol/asm/kernels/transaction/miden-project.toml +++ b/crates/miden-protocol/asm/kernels/transaction/miden-project.toml @@ -8,12 +8,13 @@ path = "lib/api.masm" [[bin]] name = "main" -path = "main.masm" +path = "bin/main.masm" [[bin]] name = "tx-script-main" -path = "tx_script_main.masm" +path = "bin/tx_script_main.masm" [dependencies] miden-core.workspace = true miden-protocol-utils.workspace = true +miden-tx-kernel-core.workspace = true diff --git a/crates/miden-protocol/asm/miden-project.toml b/crates/miden-protocol/asm/miden-project.toml index 66a7e84bc7..2c027f1518 100644 --- a/crates/miden-protocol/asm/miden-project.toml +++ b/crates/miden-protocol/asm/miden-project.toml @@ -1,5 +1,5 @@ [workspace] -members = ["kernels/batch", "kernels/transaction", "protocol", "utils"] +members = ["kernels/batch", "kernels/transaction", "kernels/transaction-core", "protocol", "utils"] [workspace.package] version = "0.16.0" @@ -8,3 +8,4 @@ version = "0.16.0" miden-core = { linkage = "dynamic", version = "0.23.1" } miden-protocol-utils = { linkage = "static", path = "utils" } miden-tx-kernel = { linkage = "dynamic", path = "kernels/transaction" } +miden-tx-kernel-core = { linkage = "static", path = "kernels/transaction-core" } diff --git a/crates/miden-protocol/build.rs b/crates/miden-protocol/build.rs index b5d184cfd6..fa42ceec0f 100644 --- a/crates/miden-protocol/build.rs +++ b/crates/miden-protocol/build.rs @@ -4,17 +4,9 @@ use std::path::Path; use std::sync::Arc; use fs_err as fs; -use miden_assembly::ast::{Module, ModuleKind}; use miden_assembly::debuginfo::{DefaultSourceManager, SourceManager}; use miden_assembly::diagnostics::{IntoDiagnostic, Result, WrapErr, miette}; -use miden_assembly::{ - Assembler, - KernelLibrary, - Library, - ModuleParser, - ProjectSourceInputs, - ProjectTargetSelector, -}; +use miden_assembly::{Assembler, KernelLibrary, Library, ProjectTargetSelector}; use miden_core::events::EventId; use miden_mast_package::{Package, PackageId, TargetType, Version}; use miden_package_registry::{InMemoryPackageRegistry, PackageCache}; @@ -30,6 +22,7 @@ const ASM_PROTOCOL_DIR: &str = "protocol"; const UTILS_DIR: &str = "utils"; const ASM_TX_KERNEL_DIR: &str = "kernels/transaction"; +const ASM_TX_KERNEL_CORE_DIR: &str = "kernels/transaction-core"; const ASM_BATCH_KERNEL_DIR: &str = "kernels/batch"; /// Name of the manifest file defining a Miden project. @@ -38,13 +31,6 @@ const PROJECT_MANIFEST: &str = "miden-project.toml"; /// The build profile used when assembling the Miden projects. const BUILD_PROFILE: &str = "release"; -/// Name of the directory containing the transaction kernel modules, relative to the transaction -/// kernel project root. -const TX_KERNEL_LIB_DIR: &str = "lib"; - -/// File name of the transaction kernel's root module, which defines the exported kernel API. -const TX_KERNEL_API_FILE: &str = "api.masm"; - // Executable target names, as declared in the respective `miden-project.toml` files. const TX_KERNEL_MAIN_TARGET: &str = "main"; const TX_SCRIPT_MAIN_TARGET: &str = "tx-script-main"; @@ -147,17 +133,18 @@ fn compile_batch_kernel( /// /// The project is expected to have the following structure: /// -/// - {project_dir}/lib/api.masm -> defines exported procedures from the transaction kernel. -/// - {project_dir}/lib -> contains the kernel modules, assembled under `$kernel`. -/// - {project_dir}/main.masm -> defines the executable program of the transaction kernel. -/// - {project_dir}/tx_script_main -> defines the executable program of the arbitrary transaction -/// script. +/// - {project_dir}/lib/api.masm -> defines exported procedures from the transaction +/// kernel. +/// - {project_dir}/bin/main.masm -> defines the executable program of the transaction +/// kernel. +/// - {project_dir}/bin/tx_script_main.masm -> defines the executable program of the arbitrary +/// transaction script. /// /// The following are written to the `target_dir`: /// /// - the kernel library package, compiled from lib/api.masm. -/// - the kernel executable package, compiled from main.masm. -/// - the transaction script executor package, compiled from tx_script_main.masm. +/// - the kernel executable package, compiled from bin/main.masm. +/// - the transaction script executor package, compiled from bin/tx_script_main.masm. /// /// The kernel procedures table is written to `{build_dir}/procedures.rs`. fn compile_tx_kernel( @@ -180,110 +167,42 @@ fn compile_tx_kernel( // generate kernel `procedures.rs` file generate_kernel_proc_hash_file(kernel_package.try_into_kernel_library()?, build_dir)?; - // Assemble the executable targets and write them to a masp file + // Assemble the executable targets and write their packages to the `target_dir`. // - // Executable targets are assembled under the `$exec` namespace, but the kernel executables - // `exec` kernel modules directly, expecting them under `$kernel`. To support this, the kernel - // modules are parsed under the `$kernel` namespace and provided to the assembler explicitly. - for (target_name, root_file) in [ - (TX_KERNEL_MAIN_TARGET, "main.masm"), - (TX_SCRIPT_MAIN_TARGET, "tx_script_main.masm"), - ] { - let mut parser = ModuleParser::new(ModuleKind::Executable); - parser.set_warnings_as_errors(true); - let root = parser.parse_file( - miden_assembly::Path::exec_path(), - project_dir.join(root_file), - source_manager.clone(), - )?; - let support = parse_kernel_modules(&project_dir, source_manager.clone())?; - - let package = project_assembler.assemble_with_sources( - ProjectTargetSelector::Executable(target_name), - BUILD_PROFILE, - ProjectSourceInputs { root, support }, - )?; + // The kernel internals now live in the `miden-tx-kernel-core` library, which both programs + // depend on, so the executables are assembled directly through the project manifest. + for target_name in [TX_KERNEL_MAIN_TARGET, TX_SCRIPT_MAIN_TARGET] { + let package = project_assembler + .assemble(ProjectTargetSelector::Executable(target_name), BUILD_PROFILE)?; package.write_masp_file(target_dir).into_diagnostic()?; } // make sure the store is released before it is borrowed again below drop(project_assembler); - // Build the kernel modules as a plain library and write to as a masp file. - // This is needed in test assemblers to access individual procedures which would otherwise - // be hidden when using KernelLibrary. + // Assemble the kernel internals as a plain library and write its package to the `target_dir`. + // This is needed in test assemblers to access individual internal procedures which are not + // part of the kernel's public syscall API (api.masm). #[cfg(any(feature = "testing", test))] compile_kernel_testing_lib(source_dir, target_dir, store)?; Ok(()) } -/// Parses the transaction kernel modules in `{project_dir}/lib` under the `$kernel` namespace. -/// -/// The kernel's root module (api.masm) is excluded: when assembling the kernel executables it is -/// provided by the kernel library package, which the project assembler links automatically. -// boxed modules are required by `ProjectSourceInputs` -#[allow(clippy::vec_box)] -fn parse_kernel_modules( - project_dir: &Path, - source_manager: Arc, -) -> Result>> { - let lib_dir = project_dir.join(TX_KERNEL_LIB_DIR); - - let mut modules = Vec::new(); - for module_file in shared::get_masm_files(&lib_dir)? { - if module_file.file_name().is_some_and(|name| name == TX_KERNEL_API_FILE) { - continue; - } - - let module_name = module_file - .file_stem() - .and_then(|stem| stem.to_str()) - .ok_or_else(|| miette::miette!("invalid module file name: {module_file:?}"))?; - let module_path = miden_assembly::Path::kernel_path().join(module_name); - - let mut parser = ModuleParser::new(ModuleKind::Library); - parser.set_warnings_as_errors(true); - modules.push(parser.parse_file(&module_path, &module_file, source_manager.clone())?); - } - - Ok(modules) -} - -/// Assembles the transaction kernel modules as a plain library (i.e. not as a kernel) with the -/// utils library statically linked, and saves the resulting package to `target_dir`. +/// Assembles the `miden-tx-kernel-core` library and saves the resulting package to the +/// `target_dir`. #[cfg(any(feature = "testing", test))] fn compile_kernel_testing_lib( source_dir: &Path, target_dir: &Path, store: &mut InMemoryPackageRegistry, ) -> Result<()> { - use miden_mast_package::TargetType; - use miden_project::Linkage; - + let core_manifest = source_dir.join(ASM_TX_KERNEL_CORE_DIR).join(PROJECT_MANIFEST); let source_manager: Arc = Arc::new(DefaultSourceManager::default()); + let mut assembler = + build_assembler(source_manager).for_project_at_path(core_manifest, store)?; - let utils_package = { - let utils_manifest = source_dir.join(UTILS_DIR).join(PROJECT_MANIFEST); - let mut utils_assembler = - build_assembler(source_manager.clone()).for_project_at_path(utils_manifest, store)?; - utils_assembler.assemble(ProjectTargetSelector::Library, BUILD_PROFILE)? - }; - - let mut assembler = build_assembler(source_manager.clone()) - .with_dynamic_library(miden_core_lib::CoreLibrary::default())?; - assembler.link_package(utils_package, Linkage::Static)?; - - let modules = parse_kernel_modules(&source_dir.join(ASM_TX_KERNEL_DIR), source_manager)?; - let library = assembler.assemble_library(modules)?; - - let package = Package::from_library( - "miden-tx-kernel-testing".into(), - package_version()?, - TargetType::Library, - library, - [], - ); + let package = assembler.assemble(ProjectTargetSelector::Library, BUILD_PROFILE)?; package.write_masp_file(target_dir).into_diagnostic() } @@ -407,12 +326,6 @@ fn core_package_registry() -> Result { Ok(registry) } -/// Returns the version of this crate as the package version. -#[cfg(any(feature = "testing", test))] -fn package_version() -> Result { - miden_mast_package::Version::parse(env!("CARGO_PKG_VERSION")).into_diagnostic() -} - // ERROR CONSTANTS FILE GENERATION // ================================================================================================ @@ -455,6 +368,12 @@ fn generate_error_constants(asm_source_dir: &Path, build_dir: &str) -> Result<() let tx_kernel_dir = asm_source_dir.join(ASM_TX_KERNEL_DIR); let mut errors = shared::extract_all_masm_errors(&tx_kernel_dir) .context("failed to extract all masm errors")?; + // Most kernel error constants live in the internals library, which is a separate project. + let kernel_core_dir = asm_source_dir.join(ASM_TX_KERNEL_CORE_DIR); + errors.extend( + shared::extract_all_masm_errors(&kernel_core_dir) + .context("failed to extract all masm errors")?, + ); errors.extend_from_slice(&shared_utils_errors); validate_tx_kernel_category(&errors)?; @@ -676,29 +595,6 @@ mod shared { Ok(()) } - /// Returns a vector with paths to all MASM files in the specified directory and its - /// subdirectories. - /// - /// All non-MASM files are skipped. - pub fn get_masm_files>(dir_path: P) -> Result> { - let mut files = Vec::new(); - - let path = dir_path.as_ref(); - if path.is_dir() { - for entry in WalkDir::new(path) { - let entry = entry.into_diagnostic()?; - let file_path = entry.path().to_path_buf(); - if is_masm_file(&file_path).into_diagnostic()? { - files.push(file_path); - } - } - } else { - println!("cargo:warn=The specified path is not a directory."); - } - - Ok(files) - } - /// Returns true if the provided path resolves to a file with `.masm` extension. /// /// # Errors diff --git a/crates/miden-protocol/src/transaction/kernel/memory.rs b/crates/miden-protocol/src/transaction/kernel/memory.rs index 9c61295b83..36e9323e9c 100644 --- a/crates/miden-protocol/src/transaction/kernel/memory.rs +++ b/crates/miden-protocol/src/transaction/kernel/memory.rs @@ -452,8 +452,8 @@ pub const INPUT_NOTE_ASSETS_OFFSET: MemoryOffset = 44; // note is outdated. It holds 1 if some changes were made to the note assets since the last // re-computation, and 0 otherwise. // It is set to 0 after every recomputation of the assets commitment in the -// `$kernel::note::compute_output_note_assets_commitment` procedure. It is set to 1 in the -// `$kernel::output_note::add_asset` procedure after any change was made to the assets data. +// `miden::tx_kernel_core::note::compute_output_note_assets_commitment` procedure. It is set to 1 in the +// `miden::tx_kernel_core::output_note::add_asset` procedure after any change was made to the assets data. /// The memory address at which the output notes section begins. pub const OUTPUT_NOTE_SECTION_OFFSET: MemoryOffset = 16_777_216; diff --git a/crates/miden-protocol/src/transaction/kernel/mod.rs b/crates/miden-protocol/src/transaction/kernel/mod.rs index c6a8ba0789..ab706df4a4 100644 --- a/crates/miden-protocol/src/transaction/kernel/mod.rs +++ b/crates/miden-protocol/src/transaction/kernel/mod.rs @@ -412,7 +412,7 @@ impl TransactionKernel { #[cfg(any(feature = "testing", test))] impl TransactionKernel { const KERNEL_TESTING_PACKAGE_BYTES: &'static [u8] = - include_bytes!(concat!(env!("OUT_DIR"), "/assets/kernels/miden-tx-kernel-testing.masp")); + include_bytes!(concat!(env!("OUT_DIR"), "/assets/kernels/miden-tx-kernel-core.masp")); /// Returns the kernel library. pub fn library() -> Library { diff --git a/crates/miden-standards/src/code_builder/mod.rs b/crates/miden-standards/src/code_builder/mod.rs index 9bb240d79f..9e2d87df72 100644 --- a/crates/miden-standards/src/code_builder/mod.rs +++ b/crates/miden-standards/src/code_builder/mod.rs @@ -425,10 +425,10 @@ impl CodeBuilder { /// Returns a [`CodeBuilder`] with the transaction kernel as a library. /// /// This assembler is the same as [`TransactionKernel::assembler`] but additionally includes the - /// kernel library on the namespace of `$kernel`. The `$kernel` library is added separately - /// because even though the library (`api.masm`) and the kernel binary (`main.masm`) include - /// this code, it is not otherwise accessible. By adding it separately, we can invoke procedures - /// from the kernel library to test them individually. + /// kernel library on the namespace of `miden::tx_kernel_core`. The `miden::tx_kernel_core` + /// library is added separately because even though the library (`api.masm`) and the kernel + /// binary (`main.masm`) include this code, it is not otherwise accessible. By adding it + /// separately, we can invoke procedures from the kernel library to test them individually. #[cfg(any(feature = "testing", test))] pub fn with_kernel_library(source_manager: Arc) -> Self { let mut builder = Self::with_source_manager(source_manager); @@ -473,7 +473,7 @@ impl CodeBuilder { // standards library. let mut builder = Self::with_source_manager(source_manager); - // Expose kernel procedures under `$kernel` for testing. + // Expose kernel procedures under `miden::tx_kernel_core` for testing. builder .link_dynamic_library(&TransactionKernel::library()) .expect("failed to link kernel library"); diff --git a/crates/miden-testing/src/kernel_tests/tx/test_account.rs b/crates/miden-testing/src/kernel_tests/tx/test_account.rs index b655fe7137..b0cd13452d 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_account.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_account.rs @@ -205,7 +205,7 @@ async fn test_account_validate_id() -> anyhow::Result<()> { let suffix = Felt::try_from((account_id % (1u128 << 64)) as u64)?; let code = " - use $kernel::account_id + use miden::tx_kernel_core::account_id begin exec.account_id::validate @@ -269,7 +269,7 @@ pub async fn test_compute_code_commitment() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account->mock_account begin @@ -298,8 +298,8 @@ async fn test_get_item() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::account - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::prologue const SLOT_NAME = word("{slot_name}") @@ -344,7 +344,7 @@ async fn test_get_map_item() -> anyhow::Result<()> { for (key, expected_value) in map.entries() { let code = format!( r#" - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account const SLOT_NAME = word("{slot_name}") @@ -392,8 +392,8 @@ async fn test_get_native_storage_slot_type() -> anyhow::Result<()> { let code = format!( " - use $kernel::account - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -513,7 +513,7 @@ async fn test_is_slot_id_lt() -> anyhow::Result<()> { for (prev_slot, curr_slot) in test_cases { let code = format!( r#" - use $kernel::account + use miden::tx_kernel_core::account begin push.{curr_prefix}.{curr_suffix}.{prev_prefix}.{prev_suffix} @@ -550,8 +550,8 @@ async fn test_set_item() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::account - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::prologue const MOCK_VALUE_SLOT0 = word("{slot_name}") @@ -605,7 +605,7 @@ async fn test_set_map_item() -> anyhow::Result<()> { r#" use miden::core::sys - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account->mock_account const SLOT_NAME=word("{slot_name}") @@ -687,7 +687,7 @@ async fn test_get_initial_storage_commitment() -> anyhow::Result<()> { let code = format!( r#" use miden::protocol::active_account - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -737,7 +737,7 @@ async fn test_compute_storage_commitment() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account->mock_account const MOCK_VALUE_SLOT0=word("{mock_value_slot0}") @@ -884,7 +884,7 @@ async fn test_get_vault_root() -> anyhow::Result<()> { let code = format!( r#" use miden::protocol::active_account - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -905,7 +905,7 @@ async fn test_get_vault_root() -> anyhow::Result<()> { let code = format!( r#" use miden::protocol::active_account - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account->mock_account begin @@ -1282,8 +1282,8 @@ async fn test_authenticate_and_track_procedure() -> anyhow::Result<()> { let code = format!( " - use $kernel::account - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -1586,7 +1586,7 @@ async fn test_has_storage_slot() -> anyhow::Result<()> { r#" use miden::core::sys - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account->mock_account const SLOT_NAME = word("{slot_name}") @@ -1689,8 +1689,8 @@ async fn test_get_initial_item() -> anyhow::Result<()> { // Test that get_initial_item returns the initial value before any changes let code = format!( r#" - use $kernel::account - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::prologue use mock::account->mock_account const MOCK_VALUE_SLOT0 = word("{mock_value_slot0}") @@ -1755,7 +1755,7 @@ async fn test_get_initial_map_item() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account->mock_account const MOCK_MAP_SLOT = word("{mock_map_slot}") @@ -1873,8 +1873,8 @@ async fn test_get_item_and_get_initial_item_for_all_slots() -> anyhow::Result<() let code = format!( r#" - use $kernel::account - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::prologue use mock::account->mock_account {slot_constants} diff --git a/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs b/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs index e548e4d455..eb444c973a 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs @@ -99,8 +99,8 @@ async fn test_active_note_get_metadata() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note begin @@ -150,8 +150,8 @@ async fn test_active_note_get_metadata_no_extra_word() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note begin @@ -220,8 +220,8 @@ async fn test_active_note_is_public_and_is_private( let code = format!( r#" - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note begin @@ -261,8 +261,8 @@ async fn test_active_note_get_sender() -> anyhow::Result<()> { // calling get_sender should return sender of the active note let code = " - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note begin @@ -306,8 +306,8 @@ async fn test_active_note_get_note_type(#[case] note_type: NoteType) -> anyhow:: }; let code = " - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note use miden::protocol::note @@ -428,8 +428,8 @@ async fn test_active_note_get_assets() -> anyhow::Result<()> { r#" use miden::core::sys - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note proc process_note_0 @@ -558,8 +558,8 @@ async fn test_active_note_get_storage() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note begin @@ -652,7 +652,7 @@ async fn test_active_note_get_exactly_8_inputs() -> anyhow::Result<()> { .build()?; let tx_code = " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::active_note begin @@ -697,7 +697,7 @@ async fn test_active_note_get_serial_number() -> anyhow::Result<()> { // calling get_serial_number should return the serial number of the active note let code = " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::active_note begin @@ -738,7 +738,7 @@ async fn test_active_note_get_script_root() -> anyhow::Result<()> { // calling get_script_root should return script root of the active note let code = " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::active_note begin @@ -818,8 +818,8 @@ async fn test_note_find_attachment( let code = format!( r#" - use $kernel::prologue - use $kernel::note->note_internal + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note->note_internal use miden::protocol::active_note use miden::protocol::input_note diff --git a/crates/miden-testing/src/kernel_tests/tx/test_asset.rs b/crates/miden-testing/src/kernel_tests/tx/test_asset.rs index b394abed5d..fb53ee804b 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_asset.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_asset.rs @@ -41,7 +41,7 @@ async fn test_create_fungible_asset_succeeds() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::faucet begin @@ -80,7 +80,7 @@ async fn test_create_non_fungible_asset_succeeds() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::faucet begin @@ -143,7 +143,7 @@ async fn test_validate_non_fungible_asset( ) -> anyhow::Result<()> { let code = format!( " - use $kernel::non_fungible_asset + use miden::tx_kernel_core::non_fungible_asset begin # a random asset value @@ -221,7 +221,7 @@ async fn test_validate_fungible_asset( ) -> anyhow::Result<()> { let code = format!( " - use $kernel::fungible_asset + use miden::tx_kernel_core::fungible_asset begin push.{ASSET_VALUE} @@ -275,7 +275,7 @@ async fn test_validate_asset_metadata( ) -> anyhow::Result<()> { let code = format!( " - use $kernel::asset + use miden::tx_kernel_core::asset begin push.{asset_metadata} @@ -309,7 +309,7 @@ async fn test_key_to_asset_metadata( let code = format!( " - use $kernel::asset + use miden::tx_kernel_core::asset begin push.{ASSET_KEY} diff --git a/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs b/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs index 1e02971c5d..29b333aa9e 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs @@ -39,7 +39,7 @@ async fn get_balance_returns_correct_amount() -> anyhow::Result<()> { let asset_key = AssetVaultKey::new_fungible(faucet_id, AssetCallbackFlag::Disabled); let code = format!( r#" - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::active_account begin @@ -75,9 +75,9 @@ async fn peek_asset_returns_correct_asset() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue - use $kernel::memory - use $kernel::asset_vault + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::asset_vault begin exec.prologue::prepare_transaction @@ -124,7 +124,7 @@ async fn test_get_balance_non_fungible_fails() -> anyhow::Result<()> { NonFungibleAsset::new(&NonFungibleAssetDetails::new(faucet_id, vec![1, 2, 3])); let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::active_account begin @@ -154,7 +154,7 @@ async fn test_has_non_fungible_asset() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::active_account begin @@ -186,7 +186,7 @@ async fn test_add_fungible_asset_success() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -232,7 +232,7 @@ async fn test_add_non_fungible_asset_fail_overflow() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -266,7 +266,7 @@ async fn test_add_non_fungible_asset_success() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -309,7 +309,7 @@ async fn test_add_non_fungible_asset_fail_duplicate() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -343,7 +343,7 @@ async fn test_remove_fungible_asset_success_no_balance_remaining() -> anyhow::Re let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -384,7 +384,7 @@ async fn test_remove_fungible_asset_fail_remove_too_much() -> anyhow::Result<()> let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -419,7 +419,7 @@ async fn test_remove_fungible_asset_success_balance_remaining() -> anyhow::Resul let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -470,7 +470,7 @@ async fn test_remove_inexisting_non_fungible_asset_fails() -> anyhow::Result<()> let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -507,7 +507,7 @@ async fn test_remove_non_fungible_asset_success() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account begin @@ -551,7 +551,7 @@ async fn test_merge_fungible_asset_success() -> anyhow::Result<()> { for (asset_a, asset_b) in [(asset0, asset1), (asset1, asset0)] { let code = format!( " - use $kernel::fungible_asset + use miden::tx_kernel_core::fungible_asset begin push.{ASSETA} @@ -593,7 +593,7 @@ async fn test_merge_fungible_asset_fails_when_max_amount_exceeded() -> anyhow::R let code = format!( " - use $kernel::fungible_asset + use miden::tx_kernel_core::fungible_asset begin push.{ASSETA} @@ -633,7 +633,7 @@ async fn test_split_fungible_asset_success( let code = format!( " - use $kernel::fungible_asset + use miden::tx_kernel_core::fungible_asset begin push.{ASSET0} @@ -670,7 +670,7 @@ async fn test_split_fungible_asset_fails_when_amount_exceeds_balance() -> anyhow let code = format!( " - use $kernel::fungible_asset + use miden::tx_kernel_core::fungible_asset begin push.{ASSET0} diff --git a/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs b/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs index bacbc4854b..f9932e0051 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs @@ -58,8 +58,8 @@ async fn test_transaction_epilogue() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue - use $kernel::epilogue + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::epilogue use miden::protocol::output_note use miden::core::sys @@ -167,8 +167,8 @@ async fn test_compute_output_note_details_commitment() -> anyhow::Result<()> { .build()?; let mut code = " - use $kernel::prologue - use $kernel::epilogue + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::epilogue use miden::protocol::output_note use miden::core::sys @@ -302,10 +302,10 @@ async fn test_block_expiration_height_monotonically_decreases() -> anyhow::Resul let test_pairs: [(u64, u64); 3] = [(9, 12), (18, 3), (20, 20)]; let code_template = " - use $kernel::prologue - use $kernel::tx - use $kernel::epilogue - use $kernel::account + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::tx + use miden::tx_kernel_core::epilogue + use miden::tx_kernel_core::account begin exec.prologue::prepare_transaction @@ -352,7 +352,7 @@ async fn test_invalid_expiration_deltas() -> anyhow::Result<()> { let test_values = [0u64, u16::MAX as u64 + 1, u32::MAX as u64]; let code_template = " - use $kernel::tx + use miden::tx_kernel_core::tx begin push.{value_1} @@ -375,10 +375,10 @@ async fn test_no_expiration_delta_set() -> anyhow::Result<()> { let tx_context = TestTransactionBuilder::with_existing_mock_account().build()?; let code_template = " - use $kernel::prologue - use $kernel::epilogue - use $kernel::tx - use $kernel::account + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::epilogue + use miden::tx_kernel_core::tx + use miden::tx_kernel_core::account begin exec.prologue::prepare_transaction @@ -413,10 +413,10 @@ async fn test_epilogue_increment_nonce_success() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::account - use $kernel::epilogue - use $kernel::memory + use miden::tx_kernel_core::epilogue + use miden::tx_kernel_core::memory const MOCK_VALUE_SLOT0 = word("{mock_value_slot0}") @@ -523,9 +523,9 @@ async fn test_epilogue_empty_transaction_with_empty_output_note() -> anyhow::Res r#" use miden::core::word use miden::protocol::output_note - use $kernel::prologue - use $kernel::epilogue - use $kernel::note + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::epilogue + use miden::tx_kernel_core::note begin exec.prologue::prepare_transaction diff --git a/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs b/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs index 0c8ed427d4..34759641f7 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs @@ -51,9 +51,9 @@ async fn test_mint_fungible_asset_succeeds() -> anyhow::Result<()> { r#" use mock::faucet->mock_faucet use miden::protocol::faucet - use $kernel::asset_vault - use $kernel::memory - use $kernel::prologue + use miden::tx_kernel_core::asset_vault + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -132,7 +132,7 @@ async fn test_mint_fungible_asset_inconsistent_faucet_id() -> anyhow::Result<()> let asset = FungibleAsset::mock(5); let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::faucet begin @@ -163,7 +163,7 @@ async fn mint_fungible_asset_fails_on_invalid_asset_metadata() -> anyhow::Result let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::faucet begin @@ -238,10 +238,10 @@ async fn test_mint_non_fungible_asset_succeeds() -> anyhow::Result<()> { r#" use miden::core::collections::smt - use $kernel::account - use $kernel::asset_vault - use $kernel::memory - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::asset_vault + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::prologue use mock::faucet->mock_faucet begin @@ -281,7 +281,7 @@ async fn test_mint_non_fungible_asset_fails_inconsistent_faucet_id() -> anyhow:: let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::faucet begin @@ -349,7 +349,7 @@ async fn test_mint_fungible_asset_with_callbacks_enabled() -> anyhow::Result<()> let code = format!( r#" use mock::faucet->mock_faucet - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -387,9 +387,9 @@ async fn test_burn_fungible_asset_succeeds() -> anyhow::Result<()> { r#" use mock::faucet->mock_faucet use miden::protocol::faucet - use $kernel::asset_vault - use $kernel::memory - use $kernel::prologue + use miden::tx_kernel_core::asset_vault + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -467,7 +467,7 @@ async fn test_burn_fungible_asset_inconsistent_faucet_id() -> anyhow::Result<()> let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::faucet begin @@ -498,7 +498,7 @@ async fn test_burn_fungible_asset_insufficient_input_amount() -> anyhow::Result< let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::faucet begin @@ -533,10 +533,10 @@ async fn test_burn_non_fungible_asset_succeeds() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::account - use $kernel::asset_vault - use $kernel::memory - use $kernel::prologue + use miden::tx_kernel_core::account + use miden::tx_kernel_core::asset_vault + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::prologue use mock::faucet->mock_faucet begin @@ -589,7 +589,7 @@ async fn test_burn_non_fungible_asset_fails_does_not_exist() -> anyhow::Result<( let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::faucet begin @@ -652,7 +652,7 @@ async fn test_burn_non_fungible_asset_fails_inconsistent_faucet_id() -> anyhow:: let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::faucet begin diff --git a/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs b/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs index 4e425e0306..08442c9dbf 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs @@ -138,7 +138,7 @@ async fn test_fpi_memory_single_account() -> anyhow::Result<()> { r#" use miden::core::sys - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::tx const MOCK_VALUE_SLOT0 = word("{mock_value_slot0}") @@ -193,7 +193,7 @@ async fn test_fpi_memory_single_account() -> anyhow::Result<()> { r#" use miden::core::sys - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::tx const MOCK_MAP_SLOT = word("{mock_map_slot}") @@ -252,7 +252,7 @@ async fn test_fpi_memory_single_account() -> anyhow::Result<()> { r#" use miden::core::sys - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::tx const MOCK_VALUE_SLOT0 = word("{mock_value_slot0}") @@ -416,7 +416,7 @@ async fn test_fpi_memory_two_accounts() -> anyhow::Result<()> { r#" use miden::core::sys - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::tx const MOCK_VALUE_SLOT0 = word("{mock_value_slot0}") @@ -1718,7 +1718,7 @@ async fn test_fpi_stale_account() -> anyhow::Result<()> { " use miden::core::sys - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::tx begin diff --git a/crates/miden-testing/src/kernel_tests/tx/test_link_map.rs b/crates/miden-testing/src/kernel_tests/tx/test_link_map.rs index 94cfddd9fa..276249e2a4 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_link_map.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_link_map.rs @@ -32,7 +32,7 @@ async fn insertion() -> anyhow::Result<()> { let code = format!( r#" - use $kernel::link_map + use miden::tx_kernel_core::link_map const MAP_PTR={map_ptr} @@ -524,7 +524,7 @@ async fn execute_link_map_test(operations: Vec) -> anyhow::Result let code = format!( r#" - use $kernel::link_map + use miden::tx_kernel_core::link_map begin {test_code} end diff --git a/crates/miden-testing/src/kernel_tests/tx/test_note.rs b/crates/miden-testing/src/kernel_tests/tx/test_note.rs index 10db2073dc..45235664f1 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_note.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_note.rs @@ -71,8 +71,8 @@ async fn test_note_setup() -> anyhow::Result<()> { }; let code = " - use $kernel::prologue - use $kernel::note + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::note begin exec.prologue::prepare_transaction @@ -127,9 +127,9 @@ async fn test_note_script_and_note_args() -> anyhow::Result<()> { }; let code = " - use $kernel::prologue - use $kernel::memory - use $kernel::note + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::note begin exec.prologue::prepare_transaction @@ -384,8 +384,8 @@ async fn test_build_metadata() -> anyhow::Result<()> { for (iteration, test_metadata) in [test_metadata1, test_metadata2].into_iter().enumerate() { let code = format!( " - use $kernel::prologue - use $kernel::output_note + use miden::tx_kernel_core::prologue + use miden::tx_kernel_core::output_note begin exec.prologue::prepare_transaction diff --git a/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs b/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs index cdd683f69b..1cfd173ae2 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs @@ -91,7 +91,7 @@ async fn test_create_note() -> anyhow::Result<()> { " use miden::protocol::output_note - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -171,7 +171,7 @@ fn note_creation_script(tag: Felt) -> String { format!( " use miden::protocol::output_note - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -198,9 +198,9 @@ async fn test_create_note_too_many_notes() -> anyhow::Result<()> { let code = format!( " use miden::protocol::output_note - use $kernel::constants::MAX_OUTPUT_NOTES_PER_TX - use $kernel::memory - use $kernel::prologue + use miden::tx_kernel_core::constants::MAX_OUTPUT_NOTES_PER_TX + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::prologue begin push.MAX_OUTPUT_NOTES_PER_TX @@ -288,7 +288,7 @@ async fn test_get_output_notes_commitment() -> anyhow::Result<()> { use miden::protocol::tx use miden::protocol::output_note - use $kernel::prologue + use miden::tx_kernel_core::prologue #! Since we execute in the kernel context, we write to local memory rather than to global #! kernel memory to avoid accidental overwrites. @@ -434,7 +434,7 @@ async fn test_create_note_and_add_asset() -> anyhow::Result<()> { " use miden::protocol::output_note - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -504,7 +504,7 @@ async fn test_create_note_and_add_multiple_assets() -> anyhow::Result<()> { let code = format!( " use miden::protocol::output_note - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -631,7 +631,7 @@ async fn test_create_note_and_add_same_nft_twice() -> anyhow::Result<()> { let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::output_note begin @@ -714,7 +714,7 @@ async fn test_add_assets_around_max_per_note( let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::output_note begin @@ -793,7 +793,7 @@ async fn test_compute_recipient() -> anyhow::Result<()> { let recipient = NoteRecipient::new(output_serial_no, input_note_1.script().clone(), storage); let code = format!( " - use $kernel::prologue + use miden::tx_kernel_core::prologue use miden::protocol::output_note use miden::protocol::note use miden::core::sys @@ -1221,7 +1221,7 @@ async fn test_add_attachment_with_invalid_num_elements_fails( " use miden::protocol::output_note use miden::standards::note_tag::DEFAULT_TAG - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::util begin @@ -1254,7 +1254,7 @@ async fn test_add_attachment_with_scheme_zero_fails() -> anyhow::Result<()> { let code = " use miden::protocol::output_note use miden::standards::note_tag::DEFAULT_TAG - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::util begin @@ -1924,7 +1924,7 @@ async fn test_add_attachments_with_too_many_overall_elements_fails() -> anyhow:: " use miden::protocol::output_note use miden::standards::note_tag::DEFAULT_TAG - use $kernel::prologue + use miden::tx_kernel_core::prologue use mock::util begin @@ -2001,7 +2001,7 @@ async fn test_output_note_index_out_of_bounds( use miden::protocol::output_note use mock::util - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction diff --git a/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs b/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs index 6c63f2c6ac..434cd5a01a 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs @@ -113,7 +113,7 @@ async fn test_transaction_prologue() -> anyhow::Result<()> { }; let code = " - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -617,7 +617,7 @@ pub async fn create_account_invalid_seed() -> anyhow::Result<()> { .build()?; let code = " - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -635,8 +635,8 @@ pub async fn create_account_invalid_seed() -> anyhow::Result<()> { async fn test_get_blk_version() -> anyhow::Result<()> { let tx_context = TestTransactionBuilder::with_existing_mock_account().build()?; let code = " - use $kernel::memory - use $kernel::prologue + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -661,8 +661,8 @@ async fn test_get_blk_version() -> anyhow::Result<()> { async fn test_get_blk_timestamp() -> anyhow::Result<()> { let tx_context = TestTransactionBuilder::with_existing_mock_account().build()?; let code = " - use $kernel::memory - use $kernel::prologue + use miden::tx_kernel_core::memory + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction diff --git a/crates/miden-testing/src/kernel_tests/tx/test_tx.rs b/crates/miden-testing/src/kernel_tests/tx/test_tx.rs index e09cf804c8..b064878814 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_tx.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_tx.rs @@ -164,7 +164,7 @@ async fn test_block_procedures() -> anyhow::Result<()> { let code = " use miden::protocol::tx - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -715,7 +715,7 @@ async fn test_get_script_root_with_script() -> anyhow::Result<()> { let code = format!( r#" use miden::protocol::tx - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction @@ -743,7 +743,7 @@ async fn test_get_script_root_with_script() -> anyhow::Result<()> { async fn test_get_script_root_without_script() -> anyhow::Result<()> { let code = r#" use miden::protocol::tx - use $kernel::prologue + use miden::tx_kernel_core::prologue begin exec.prologue::prepare_transaction diff --git a/crates/miden-testing/src/tx_context/builder.rs b/crates/miden-testing/src/tx_context/builder.rs index c8babad39b..36421ecb1f 100644 --- a/crates/miden-testing/src/tx_context/builder.rs +++ b/crates/miden-testing/src/tx_context/builder.rs @@ -50,7 +50,7 @@ use crate::MockChain; /// let tx_context = mock_chain.build_tx_context(account.id(), &[], &[])?.build()?; /// /// let code = " -/// use $kernel::prologue +/// use miden::tx_kernel_core::prologue /// /// begin /// exec.prologue::prepare_transaction