chore: migrate to protocol v0.14.0-rc.1
#1784
+1,650
−1,133
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ anyhow = { workspace = true } | |
| clap = { workspace = true } | ||
| fs-err = { workspace = true } | ||
| hex = { workspace = true } | ||
| miden-agglayer = { version = "=0.14.0-rc.1" } | ||
| miden-protocol = { features = ["std"], workspace = true } | ||
| miden-standards = { workspace = true } | ||
| rand = { workspace = true } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,9 +13,9 @@ use miden_protocol::account::{ | |
| AccountStorageMode, | ||
| AccountType, | ||
| }; | ||
| use miden_protocol::crypto::dsa::falcon512_poseidon2::{self, SecretKey as FalconSecretKey}; | ||
| use miden_protocol::crypto::rand::RandomCoin; | ||
| use miden_protocol::utils::serde::Deserializable; | ||
| use miden_protocol::{Felt, ONE, Word}; | ||
| use miden_standards::AuthMethod; | ||
| use miden_standards::account::wallets::create_basic_wallet; | ||
|
|
@@ -71,7 +71,7 @@ fn run( | |
| let bridge_admin = create_basic_wallet( | ||
| rand::random(), | ||
| AuthMethod::SingleSig { | ||
| approver: (bridge_admin_pub.into(), AuthScheme::Falcon512Poseidon2), | ||
| }, | ||
| AccountType::RegularAccountImmutableCode, | ||
| AccountStorageMode::Public, | ||
|
|
@@ -83,7 +83,7 @@ fn run( | |
| let ger_manager = create_basic_wallet( | ||
| rand::random(), | ||
| AuthMethod::SingleSig { | ||
| approver: (ger_manager_pub.into(), AuthScheme::Falcon512Poseidon2), | ||
| }, | ||
| AccountType::RegularAccountImmutableCode, | ||
| AccountStorageMode::Public, | ||
|
|
@@ -104,14 +104,14 @@ fn run( | |
|
|
||
| // Write .mac files. | ||
| let bridge_admin_secrets = bridge_admin_secret | ||
| .map(|sk| vec![AuthSecretKey::Falcon512Poseidon2(sk)]) | ||
| .unwrap_or_default(); | ||
| AccountFile::new(bridge_admin, bridge_admin_secrets) | ||
| .write(output_dir.join("bridge_admin.mac")) | ||
| .context("failed to write bridge_admin.mac")?; | ||
|
|
||
| let ger_manager_secrets = ger_manager_secret | ||
| .map(|sk| vec![AuthSecretKey::Falcon512Poseidon2(sk)]) | ||
| .unwrap_or_default(); | ||
| AccountFile::new(ger_manager, ger_manager_secrets) | ||
| .write(output_dir.join("ger_manager.mac")) | ||
|
|
@@ -156,11 +156,11 @@ path = "bridge.mac" | |
| } | ||
|
|
||
| /// Generates a new Falcon512 keypair using a random seed. | ||
| fn generate_falcon_keypair() -> (falcon512_poseidon2::PublicKey, FalconSecretKey) { | ||
| let mut rng = ChaCha20Rng::from_seed(rand::random()); | ||
| let auth_seed: [u64; 4] = rng.random(); | ||
| let mut coin = RandomCoin::new(Word::from(auth_seed.map(Felt::new))); | ||
| let secret_key = FalconSecretKey::with_rng(&mut coin); | ||
| let public_key = secret_key.public_key(); | ||
| (public_key, secret_key) | ||
| } | ||
|
|
@@ -170,11 +170,11 @@ fn generate_falcon_keypair() -> (falcon512_rpo::PublicKey, RpoSecretKey) { | |
| fn resolve_pubkey( | ||
| hex_pubkey: Option<&str>, | ||
| label: &str, | ||
| ) -> anyhow::Result<(falcon512_poseidon2::PublicKey, Option<FalconSecretKey>)> { | ||
| if let Some(hex_str) = hex_pubkey { | ||
| let bytes = | ||
| hex::decode(hex_str).with_context(|| format!("invalid hex for {label} public key"))?; | ||
| let pubkey = falcon512_poseidon2::PublicKey::read_from_bytes(&bytes) | ||
| .with_context(|| format!("failed to deserialize {label} public key"))?; | ||
| Ok((pubkey, None)) | ||
| } else { | ||
|
|
@@ -199,7 +199,7 @@ fn bump_nonce_to_one(mut account: Account) -> anyhow::Result<Account> { | |
| mod tests { | ||
| use miden_node_store::genesis::config::GenesisConfig; | ||
| use miden_protocol::crypto::dsa::ecdsa_k256_keccak::SecretKey; | ||
| use miden_protocol::utils::serde::Serializable; | ||
|
|
||
| use super::*; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| # Counter program for network monitoring with note authentication | ||
| # Storage layout: | ||
| # - OWNER_SLOT: authorized wallet account id as [suffix, prefix, 0, 0] | ||
| # - COUNTER_SLOT: counter value (u64) | ||
|
|
||
| use miden::core::sys | ||
|
|
@@ -19,10 +19,10 @@ const OWNER_SLOT = word("miden::monitor::counter_contract::owner") | |
| pub proc increment | ||
| # Ensure the note sender matches the authorized wallet. | ||
| push.OWNER_SLOT[0..2] exec.active_account::get_item | ||
| # => [owner_suffix, owner_prefix, 0, 0] | ||
|
|
||
| exec.active_note::get_sender | ||
| # => [sender_suffix, sender_prefix, owner_suffix, owner_prefix, 0, 0] | ||
|
|
||
| exec.account_id::is_equal | ||
| # => [are_equal, 0, 0] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ use miden_protocol::account::auth::AuthSecretKey; | |
| use miden_protocol::account::{Account, AccountFile, AccountHeader, AccountId}; | ||
| use miden_protocol::assembly::Library; | ||
| use miden_protocol::block::{BlockHeader, BlockNumber}; | ||
| use miden_protocol::crypto::dsa::falcon512_poseidon2::SecretKey; | ||
| use miden_protocol::note::{ | ||
| Note, | ||
| NoteAssets, | ||
|
|
@@ -28,13 +28,13 @@ use miden_protocol::note::{ | |
| NoteType, | ||
| }; | ||
| use miden_protocol::transaction::{InputNotes, PartialBlockchain, TransactionArgs}; | ||
| use miden_protocol::utils::serde::Deserializable; | ||
| use miden_protocol::{Felt, Word}; | ||
| use miden_standards::account::interface::{AccountInterface, AccountInterfaceExt}; | ||
| use miden_standards::code_builder::CodeBuilder; | ||
| use miden_standards::note::{NetworkAccountTarget, NoteExecutionHint}; | ||
| use miden_tx::auth::BasicAuthenticator; | ||
| use miden_tx::utils::serde::Serializable; | ||
| use miden_tx::{LocalTransactionProver, TransactionExecutor}; | ||
| use rand::{Rng, SeedableRng}; | ||
| use rand_chacha::ChaCha20Rng; | ||
|
|
@@ -122,15 +122,19 @@ async fn fetch_counter_value( | |
| .find(|slot| slot.slot_name == COUNTER_SLOT_NAME.as_str()) | ||
| .context(format!("counter slot '{}' not found", COUNTER_SLOT_NAME.as_str()))?; | ||
|
|
||
| // The counter value is stored as a Word, with the actual u64 value in the first element | ||
| let slot_value: Word = counter_slot | ||
| .commitment | ||
| .as_ref() | ||
| .context("missing storage slot value")? | ||
| .try_into() | ||
| .context("failed to convert slot value to word")?; | ||
|
|
||
| let value = slot_value | ||
| .as_elements() | ||
| .first() | ||
| .expect("Word has 4 elements") | ||
| .as_canonical_u64(); | ||
|
|
||
| Ok(Some(value)) | ||
| } | ||
|
|
@@ -321,7 +325,7 @@ async fn setup_increment_task( | |
| .await? | ||
| .unwrap_or(wallet_account_file.account.clone()); | ||
|
|
||
| let AuthSecretKey::Falcon512Poseidon2(secret_key) = wallet_account_file | ||
| .auth_secret_keys | ||
| .first() | ||
| .expect("wallet account file should have one auth secret key") | ||
|
|
@@ -821,7 +825,8 @@ async fn create_and_submit_network_note( | |
| rng: &mut ChaCha20Rng, | ||
| ) -> Result<(String, AccountHeader, BlockNumber)> { | ||
| // Create authenticator for transaction signing | ||
| let authenticator = | ||
| BasicAuthenticator::new(&[AuthSecretKey::Falcon512Poseidon2(secret_key.clone())]); | ||
|
|
||
| let account_interface = AccountInterface::from_account(wallet_account); | ||
|
|
||
|
|
@@ -851,7 +856,7 @@ async fn create_and_submit_network_note( | |
|
|
||
| // Prove the transaction | ||
| let prover = LocalTransactionProver::default(); | ||
| let proven_tx = prover.prove(executed_tx).await.context("Failed to prove transaction")?; | ||
|
|
||
| // Submit the proven transaction | ||
| let request = ProvenTransaction { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ use miden_protocol::account::{ | |
| StorageSlotName, | ||
| }; | ||
| use miden_protocol::utils::sync::LazyLock; | ||
| use miden_protocol::{Felt, Word}; | ||
| use miden_standards::code_builder::CodeBuilder; | ||
| use miden_standards::testing::account_component::IncrNonceAuthComponent; | ||
| use tracing::instrument; | ||
|
|
@@ -46,15 +46,15 @@ pub fn create_counter_account(owner_account_id: AccountId) -> Result<Account> { | |
|
|
||
| let owner_id_slot = StorageSlot::with_value( | ||
| OWNER_SLOT_NAME.clone(), | ||
| Word::from([owner_account_id_suffix, owner_account_id_prefix, Felt::ZERO, Felt::ZERO]), | ||
| ); | ||
|
|
||
| let counter_slot = StorageSlot::with_value(COUNTER_SLOT_NAME.clone(), Word::empty()); | ||
|
|
||
| let component_code = | ||
| CodeBuilder::default().compile_component_code("counter::program", script)?; | ||
|
|
||
| let metadata = AccountComponentMetadata::new("counter::program", AccountType::all()); | ||
| let account_code = | ||
| AccountComponent::new(component_code, vec![counter_slot, owner_id_slot], metadata)?; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,15 +11,15 @@ 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, StorageMapKey}; | ||
| use miden_protocol::assembly::{ | ||
| DefaultSourceManager, | ||
| Library, | ||
| Module, | ||
| ModuleKind, | ||
| Path as MidenPath, | ||
| }; | ||
| use miden_protocol::asset::{AssetVaultKey, AssetWitness}; | ||
| use miden_protocol::block::{BlockHeader, BlockNumber}; | ||
| use miden_protocol::crypto::merkle::mmr::{MmrPeaks, PartialMmr}; | ||
| use miden_protocol::note::NoteScript; | ||
|
|
@@ -32,7 +32,7 @@ use miden_protocol::transaction::{ | |
| }; | ||
| use miden_protocol::{MastForest, Word}; | ||
| use miden_tx::auth::BasicAuthenticator; | ||
| use miden_tx::utils::serde::Serializable; | ||
| use miden_tx::{ | ||
| DataStore, | ||
| DataStoreError, | ||
|
|
@@ -203,7 +203,7 @@ pub async fn deploy_counter_account(counter_account: &Account, rpc_url: &Url) -> | |
|
|
||
| let prover = LocalTransactionProver::default(); | ||
|
|
||
| let proven_tx = prover.prove(executed_tx).await.context("Failed to prove transaction")?; | ||
|
|
||
| let request = ProvenTransaction { | ||
| transaction: proven_tx.to_bytes(), | ||
|
|
@@ -288,18 +288,8 @@ impl DataStore for MonitorDataStore { | |
| account_id: AccountId, | ||
| mut _block_refs: BTreeSet<BlockNumber>, | ||
| ) -> Result<(PartialAccount, BlockHeader, PartialBlockchain), DataStoreError> { | ||
| let account = self.get_account(account_id)?; | ||
| let partial_account = PartialAccount::from(account); | ||
|
|
||
| Ok((partial_account, self.block_header.clone(), self.partial_block_chain.clone())) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ use anyhow::Result; | |
| use miden_node_utils::crypto::get_rpo_random_coin; | ||
| use miden_protocol::account::auth::{AuthScheme, AuthSecretKey}; | ||
| use miden_protocol::account::{Account, AccountFile, AccountStorageMode, AccountType}; | ||
| use miden_protocol::crypto::dsa::falcon512_poseidon2::SecretKey; | ||
| use miden_standards::AuthMethod; | ||
| use miden_standards::account::wallets::create_basic_wallet; | ||
| use rand::{Rng, SeedableRng}; | ||
|
|
@@ -23,7 +23,7 @@ pub fn create_wallet_account() -> Result<(Account, SecretKey)> { | |
| let mut rng = ChaCha20Rng::from_seed(rand::random()); | ||
| let secret_key = SecretKey::with_rng(&mut get_rpo_random_coin(&mut rng)); | ||
| let auth = AuthMethod::SingleSig { | ||
| approver: (secret_key.public_key().into(), AuthScheme::Falcon512Poseidon2), | ||
| }; | ||
| let init_seed: [u8; 32] = rng.random(); | ||
|
|
||
|
|
@@ -43,7 +43,7 @@ pub fn save_wallet_account( | |
| secret_key: &SecretKey, | ||
| file_path: &Path, | ||
| ) -> Result<()> { | ||
| let auth_secret_key = AuthSecretKey::Falcon512Poseidon2(secret_key.clone()); | ||
| let account_file = AccountFile::new(account.clone(), vec![auth_secret_key]); | ||
| account_file.write(file_path)?; | ||
| Ok(()) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ use miden_protocol::note::NoteType; | |
| use miden_protocol::testing::account_id::{ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_SENDER}; | ||
| use miden_protocol::transaction::TransactionInputs; | ||
| use miden_testing::{Auth, MockChainBuilder}; | ||
| use miden_tx::utils::serde::Serializable; | ||
| use serde::{Deserialize, Serialize}; | ||
| use tokio::sync::watch; | ||
| use tokio::time::MissedTickBehavior; | ||
|
|
@@ -278,7 +278,9 @@ pub async fn generate_mock_transaction() -> anyhow::Result<TransactionInputs> { | |
|
|
||
| // Create an account with basic authentication | ||
| let account = mock_chain_builder | ||
| .add_existing_wallet(Auth::BasicAuth { | ||
| auth_scheme: AuthScheme::Falcon512Poseidon2, | ||
| }) | ||
| .context("Failed to add wallet to mock chain")?; | ||
|
|
||
| // Create a fungible asset | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Concerning that this is so much bigger