From d3916651d8282068876b3c691be9213533cbd63b Mon Sep 17 00:00:00 2001 From: Mimir Date: Wed, 30 Oct 2024 15:34:33 +0100 Subject: [PATCH 001/175] Ported block producer and VRF evaluator --- .../service/block_producer/vrf_evaluator.rs | 4 +- node/src/action.rs | 3 + node/src/action_kind.rs | 40 +- .../block_producer/block_producer_actions.rs | 7 +- .../block_producer/block_producer_reducer.rs | 862 +++++++++++------- .../block_producer/block_producer_state.rs | 17 +- node/src/block_producer/mod.rs | 6 - .../block_producer_vrf_evaluator_effects.rs | 238 ----- .../block_producer_vrf_evaluator_reducer.rs | 323 +++++-- node/src/block_producer/vrf_evaluator/mod.rs | 5 - .../block_producer_effectful_actions.rs | 26 + .../block_producer_effectful_effects.rs} | 172 +--- .../block_producer_effectful_service.rs} | 0 node/src/block_producer_effectful/mod.rs | 10 + ...roducer_vrf_evaluator_effectful_actions.rs | 20 + ...roducer_vrf_evaluator_effectful_effects.rs | 15 + ...oducer_vrf_evaluator_effectful_service.rs} | 2 +- .../vrf_evaluator_effectful/mod.rs | 7 + node/src/consensus/consensus_reducer.rs | 1 + node/src/effects.rs | 6 +- node/src/ledger/ledger_service.rs | 2 +- node/src/ledger/write/mod.rs | 2 +- node/src/lib.rs | 1 + node/src/reducer.rs | 10 +- node/src/service.rs | 4 +- node/src/state.rs | 19 + .../sync/transition_frontier_sync_actions.rs | 2 + .../sync/transition_frontier_sync_effects.rs | 4 + .../sync/transition_frontier_sync_reducer.rs | 1 + 29 files changed, 976 insertions(+), 833 deletions(-) delete mode 100644 node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_effects.rs create mode 100644 node/src/block_producer_effectful/block_producer_effectful_actions.rs rename node/src/{block_producer/block_producer_effects.rs => block_producer_effectful/block_producer_effectful_effects.rs} (52%) rename node/src/{block_producer/block_producer_service.rs => block_producer_effectful/block_producer_effectful_service.rs} (100%) create mode 100644 node/src/block_producer_effectful/mod.rs create mode 100644 node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs create mode 100644 node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs rename node/src/{block_producer/vrf_evaluator/block_producer_vrf_evaluator_service.rs => block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_service.rs} (65%) create mode 100644 node/src/block_producer_effectful/vrf_evaluator_effectful/mod.rs diff --git a/node/common/src/service/block_producer/vrf_evaluator.rs b/node/common/src/service/block_producer/vrf_evaluator.rs index 837a582a30..5f9768e538 100644 --- a/node/common/src/service/block_producer/vrf_evaluator.rs +++ b/node/common/src/service/block_producer/vrf_evaluator.rs @@ -51,7 +51,9 @@ pub fn vrf_evaluator( } } -impl node::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorService for NodeService { +impl node::block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorService + for NodeService +{ fn evaluate(&mut self, data: VrfEvaluatorInput) { if let Some(bp) = self.block_producer.as_mut() { let _ = bp.vrf_evaluation_sender.send(data); diff --git a/node/src/action.rs b/node/src/action.rs index 867890ea0b..88ac985bf8 100644 --- a/node/src/action.rs +++ b/node/src/action.rs @@ -5,6 +5,7 @@ pub type ActionWithMeta = redux::ActionWithMeta; pub type ActionWithMetaRef<'a> = redux::ActionWithMeta<&'a Action>; pub use crate::block_producer::BlockProducerAction; +pub use crate::block_producer_effectful::BlockProducerEffectfulAction; pub use crate::consensus::ConsensusAction; pub use crate::event_source::EventSourceAction; pub use crate::external_snark_worker::ExternalSnarkWorkerAction; @@ -48,6 +49,7 @@ pub enum Action { TransactionPoolEffect(TransactionPoolEffectfulAction), ExternalSnarkWorker(ExternalSnarkWorkerAction), BlockProducer(BlockProducerAction), + BlockProducerEffectful(BlockProducerEffectfulAction), Rpc(RpcAction), RpcEffectful(RpcEffectfulAction), @@ -92,6 +94,7 @@ impl redux::EnablingCondition for Action { Action::SnarkPoolEffect(a) => a.is_enabled(state, time), Action::ExternalSnarkWorker(a) => a.is_enabled(state, time), Action::BlockProducer(a) => a.is_enabled(state, time), + Action::BlockProducerEffectful(a) => a.is_enabled(state, time), Action::Rpc(a) => a.is_enabled(state, time), Action::WatchedAccounts(a) => a.is_enabled(state, time), Action::TransactionPool(a) => a.is_enabled(state, time), diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 6009bf5971..ca8823d8c8 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -17,6 +17,8 @@ use strum_macros::VariantArray; use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorAction; use crate::block_producer::BlockProducerAction; +use crate::block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorEffectfulAction; +use crate::block_producer_effectful::BlockProducerEffectfulAction; use crate::consensus::ConsensusAction; use crate::event_source::EventSourceAction; use crate::external_snark_worker::ExternalSnarkWorkerAction; @@ -129,6 +131,13 @@ pub enum ActionKind { BlockProducerWonSlotTransactionsGet, BlockProducerWonSlotTransactionsSuccess, BlockProducerWonSlotWait, + BlockProducerEffectfulBlockProveInit, + BlockProducerEffectfulBlockProveSuccess, + BlockProducerEffectfulBlockUnprovenBuild, + BlockProducerEffectfulStagedLedgerDiffCreateInit, + BlockProducerEffectfulStagedLedgerDiffCreateSuccess, + BlockProducerEffectfulWonSlot, + BlockProducerEffectfulWonSlotDiscard, BlockProducerVrfEvaluatorBeginDelegatorTableConstruction, BlockProducerVrfEvaluatorBeginEpochEvaluation, BlockProducerVrfEvaluatorCheckEpochBounds, @@ -145,6 +154,7 @@ pub enum ActionKind { BlockProducerVrfEvaluatorProcessSlotEvaluationSuccess, BlockProducerVrfEvaluatorSelectInitialSlot, BlockProducerVrfEvaluatorWaitForNextEvaluation, + BlockProducerVrfEvaluatorEffectfulEvaluateSlot, CheckTimeouts, ConsensusBestTipUpdate, ConsensusBlockChainProofUpdate, @@ -694,7 +704,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 581; + pub const COUNT: u16 = 589; } impl std::fmt::Display for ActionKind { @@ -721,6 +731,7 @@ impl ActionKindGet for Action { Self::TransactionPoolEffect(a) => a.kind(), Self::ExternalSnarkWorker(a) => a.kind(), Self::BlockProducer(a) => a.kind(), + Self::BlockProducerEffectful(a) => a.kind(), Self::Rpc(a) => a.kind(), Self::RpcEffectful(a) => a.kind(), Self::WatchedAccounts(a) => a.kind(), @@ -969,6 +980,25 @@ impl ActionKindGet for BlockProducerAction { } } +impl ActionKindGet for BlockProducerEffectfulAction { + fn kind(&self) -> ActionKind { + match self { + Self::VrfEvaluator(a) => a.kind(), + Self::WonSlot { .. } => ActionKind::BlockProducerEffectfulWonSlot, + Self::WonSlotDiscard { .. } => ActionKind::BlockProducerEffectfulWonSlotDiscard, + Self::StagedLedgerDiffCreateInit => { + ActionKind::BlockProducerEffectfulStagedLedgerDiffCreateInit + } + Self::StagedLedgerDiffCreateSuccess => { + ActionKind::BlockProducerEffectfulStagedLedgerDiffCreateSuccess + } + Self::BlockUnprovenBuild => ActionKind::BlockProducerEffectfulBlockUnprovenBuild, + Self::BlockProveInit => ActionKind::BlockProducerEffectfulBlockProveInit, + Self::BlockProveSuccess => ActionKind::BlockProducerEffectfulBlockProveSuccess, + } + } +} + impl ActionKindGet for RpcAction { fn kind(&self) -> ActionKind { match self { @@ -1482,6 +1512,14 @@ impl ActionKindGet for BlockProducerVrfEvaluatorAction { } } +impl ActionKindGet for BlockProducerVrfEvaluatorEffectfulAction { + fn kind(&self) -> ActionKind { + match self { + Self::EvaluateSlot { .. } => ActionKind::BlockProducerVrfEvaluatorEffectfulEvaluateSlot, + } + } +} + impl ActionKindGet for P2pConnectionOutgoingAction { fn kind(&self) -> ActionKind { match self { diff --git a/node/src/block_producer/block_producer_actions.rs b/node/src/block_producer/block_producer_actions.rs index b4baca2dfc..e234f33495 100644 --- a/node/src/block_producer/block_producer_actions.rs +++ b/node/src/block_producer/block_producer_actions.rs @@ -4,11 +4,10 @@ use openmina_core::block::ArcBlockWithHash; use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; +use crate::block_producer_effectful::StagedLedgerDiffCreateOutput; + use super::vrf_evaluator::BlockProducerVrfEvaluatorAction; -use super::{ - BlockProducerCurrentState, BlockProducerWonSlot, BlockProducerWonSlotDiscardReason, - StagedLedgerDiffCreateOutput, -}; +use super::{BlockProducerCurrentState, BlockProducerWonSlot, BlockProducerWonSlotDiscardReason}; pub type BlockProducerActionWithMeta = redux::ActionWithMeta; pub type BlockProducerActionWithMetaRef<'a> = redux::ActionWithMeta<&'a BlockProducerAction>; diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index d51596312f..2451bf6507 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -12,68 +12,104 @@ use mina_p2p_messages::{ StagedLedgerDiffBodyStableV1, StateBodyHash, StateHash, UnsignedExtendedUInt32StableV1, }, }; -use openmina_core::constants::constraint_constants; +use openmina_core::{block::ArcBlockWithHash, constants::constraint_constants}; use openmina_core::{ - block::AppliedBlock, + bug_condition, consensus::{ global_sub_window, grace_period_end, in_same_checkpoint_window, in_seed_update_range, relative_sub_window, }, }; +use redux::{callback, Dispatcher, Timestamp}; + +use crate::{ + transition_frontier::sync::TransitionFrontierSyncAction, Action, BlockProducerEffectfulAction, + State, Substate, TransactionPoolAction, +}; use super::{ - calc_epoch_seed, to_epoch_and_slot, BlockProducerAction, BlockProducerActionWithMetaRef, - BlockProducerCurrentState, BlockProducerEnabled, BlockProducerState, BlockWithoutProof, + calc_epoch_seed, next_epoch_first_slot, to_epoch_and_slot, + vrf_evaluator::{ + BlockProducerVrfEvaluatorAction, BlockProducerVrfEvaluatorState, InterruptReason, + }, + BlockProducerAction, BlockProducerActionWithMetaRef, BlockProducerCurrentState, + BlockProducerEnabled, BlockProducerState, BlockWithoutProof, }; impl BlockProducerState { - pub fn reducer( - &mut self, - action: BlockProducerActionWithMetaRef<'_>, - best_chain: &[AppliedBlock], - ) { - self.with_mut((), move |state| state.reducer(action, best_chain)) + pub fn reducer(state_context: Substate, action: BlockProducerActionWithMetaRef<'_>) { + BlockProducerEnabled::reducer(state_context, action); } } impl BlockProducerEnabled { - pub fn reducer( - &mut self, - action: BlockProducerActionWithMetaRef<'_>, - best_chain: &[AppliedBlock], - ) { + pub fn reducer(mut state_context: Substate, action: BlockProducerActionWithMetaRef<'_>) { let (action, meta) = action.split(); + let Ok(global_state) = state_context.get_substate_mut() else { + return; + }; + + let best_chain = &global_state.transition_frontier.best_chain; + let Some(state) = global_state.block_producer.as_mut() else { + return; + }; + match action { BlockProducerAction::VrfEvaluator(action) => { - self.vrf_evaluator.reducer(meta.with_action(action)) + BlockProducerVrfEvaluatorState::reducer( + Substate::from_compatible_substate(state_context), + meta.with_action(action), + ); } BlockProducerAction::BestTipUpdate { best_tip } => { - self.injected_blocks.remove(best_tip.hash()); + state.injected_blocks.remove(best_tip.hash()); // set the genesis timestamp on the first best tip update // TODO: move/remove once we can generate the genesis block - if self.vrf_evaluator.genesis_timestamp == redux::Timestamp::ZERO { - self.vrf_evaluator.genesis_timestamp = best_tip.genesis_timestamp(); + if state.vrf_evaluator.genesis_timestamp == redux::Timestamp::ZERO { + state.vrf_evaluator.genesis_timestamp = best_tip.genesis_timestamp(); + } + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + Self::dispatch_best_tip_update(dispatcher, state, best_tip); + } + BlockProducerAction::WonSlotSearch => { + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + if let Some(won_slot) = state.block_producer.with(None, |bp| { + let best_tip = state.transition_frontier.best_tip()?; + let cur_global_slot = state.cur_global_slot()?; + bp.vrf_evaluator.next_won_slot(cur_global_slot, best_tip) + }) { + dispatcher.push(BlockProducerAction::WonSlot { won_slot }); } } - BlockProducerAction::WonSlotSearch => {} BlockProducerAction::WonSlot { won_slot } => { - self.current = BlockProducerCurrentState::WonSlot { + state.current = BlockProducerCurrentState::WonSlot { time: meta.time(), won_slot: won_slot.clone(), }; + + state_context + .into_dispatcher() + .push(BlockProducerEffectfulAction::WonSlot { + won_slot: won_slot.clone(), + }); } BlockProducerAction::WonSlotDiscard { reason } => { - if let Some(won_slot) = self.current.won_slot() { - self.current = BlockProducerCurrentState::WonSlotDiscarded { + if let Some(won_slot) = state.current.won_slot() { + state.current = BlockProducerCurrentState::WonSlotDiscarded { time: meta.time(), won_slot: won_slot.clone(), - reason: reason.clone(), + reason: *reason, }; } + + state_context + .into_dispatcher() + .push(BlockProducerEffectfulAction::WonSlotDiscard { reason: *reason }); } BlockProducerAction::WonSlotWait => { - if let Some(won_slot) = self.current.won_slot() { - self.current = BlockProducerCurrentState::WonSlotWait { + if let Some(won_slot) = state.current.won_slot() { + state.current = BlockProducerCurrentState::WonSlotWait { time: meta.time(), won_slot: won_slot.clone(), }; @@ -82,37 +118,45 @@ impl BlockProducerEnabled { BlockProducerAction::WonSlotTransactionsGet => { let BlockProducerCurrentState::WonSlotProduceInit { won_slot, chain, .. - } = &mut self.current + } = &mut state.current else { return; }; - self.current = BlockProducerCurrentState::WonSlotTransactionsGet { + state.current = BlockProducerCurrentState::WonSlotTransactionsGet { time: meta.time(), won_slot: won_slot.clone(), chain: chain.clone(), - } + }; + + state_context + .into_dispatcher() + .push(TransactionPoolAction::CollectTransactionsByFee); } BlockProducerAction::WonSlotTransactionsSuccess { transactions_by_fee, } => { let BlockProducerCurrentState::WonSlotTransactionsGet { won_slot, chain, .. - } = &mut self.current + } = &mut state.current else { return; }; - self.current = BlockProducerCurrentState::WonSlotTransactionsSuccess { + state.current = BlockProducerCurrentState::WonSlotTransactionsSuccess { time: meta.time(), won_slot: won_slot.clone(), chain: chain.clone(), transactions_by_fee: transactions_by_fee.clone(), - } + }; + + state_context + .into_dispatcher() + .push(BlockProducerAction::StagedLedgerDiffCreateInit); } BlockProducerAction::WonSlotProduceInit => { - if let Some(won_slot) = self.current.won_slot() { - let Some(chain) = best_chain.last().map(|best_tip| { + if let Some(won_slot) = state.current.won_slot() { + if let Some(chain) = best_chain.last().map(|best_tip| { if best_tip.global_slot() == won_slot.global_slot() { // We are producing block which replaces current best tip // instead of extending it. @@ -120,29 +164,35 @@ impl BlockProducerEnabled { } else { best_chain.to_vec() } - }) else { - return; - }; - - self.current = BlockProducerCurrentState::WonSlotProduceInit { - time: meta.time(), - won_slot: won_slot.clone(), - chain, + }) { + state.current = BlockProducerCurrentState::WonSlotProduceInit { + time: meta.time(), + won_slot: won_slot.clone(), + chain, + }; }; } + + state_context + .into_dispatcher() + .push(BlockProducerAction::WonSlotTransactionsGet); + } + BlockProducerAction::StagedLedgerDiffCreateInit => { + state_context + .into_dispatcher() + .push(BlockProducerEffectfulAction::StagedLedgerDiffCreateInit); } - BlockProducerAction::StagedLedgerDiffCreateInit => {} BlockProducerAction::StagedLedgerDiffCreatePending => { let BlockProducerCurrentState::WonSlotTransactionsSuccess { won_slot, chain, transactions_by_fee, .. - } = &mut self.current + } = &mut state.current else { return; }; - self.current = BlockProducerCurrentState::StagedLedgerDiffCreatePending { + state.current = BlockProducerCurrentState::StagedLedgerDiffCreatePending { time: meta.time(), won_slot: won_slot.clone(), chain: std::mem::take(chain), @@ -154,11 +204,11 @@ impl BlockProducerEnabled { won_slot, chain, .. - } = &mut self.current + } = &mut state.current else { return; }; - self.current = BlockProducerCurrentState::StagedLedgerDiffCreateSuccess { + state.current = BlockProducerCurrentState::StagedLedgerDiffCreateSuccess { time: meta.time(), won_slot: won_slot.clone(), chain: std::mem::take(chain), @@ -170,302 +220,23 @@ impl BlockProducerEnabled { pending_coinbase_witness: output.pending_coinbase_witness.clone(), stake_proof_sparse_ledger: output.stake_proof_sparse_ledger.clone(), }; + + state_context + .into_dispatcher() + .push(BlockProducerEffectfulAction::StagedLedgerDiffCreateSuccess); } BlockProducerAction::BlockUnprovenBuild => { - let BlockProducerCurrentState::StagedLedgerDiffCreateSuccess { - won_slot, - chain, - diff, - diff_hash, - staged_ledger_hash, - emitted_ledger_proof, - pending_coinbase_update, - pending_coinbase_witness, - stake_proof_sparse_ledger, - .. - } = std::mem::take(&mut self.current) - else { - return; - }; - let Some(pred_block) = chain.last() else { - return; - }; - - let pred_consensus_state = &pred_block.header().protocol_state.body.consensus_state; - let pred_blockchain_state = - &pred_block.header().protocol_state.body.blockchain_state; - - let genesis_ledger_hash = &pred_blockchain_state.genesis_ledger_hash; - - let block_timestamp = won_slot.timestamp(); - let pred_global_slot = pred_consensus_state - .curr_global_slot_since_hard_fork - .clone(); - let curr_global_slot_since_hard_fork = won_slot.global_slot.clone(); - let global_slot_since_genesis = - won_slot.global_slot_since_genesis(pred_block.global_slot_diff()); - let (pred_epoch, _) = to_epoch_and_slot(&pred_global_slot); - let (next_epoch, next_slot) = to_epoch_and_slot(&curr_global_slot_since_hard_fork); - let has_ancestor_in_same_checkpoint_window = - in_same_checkpoint_window(&pred_global_slot, &curr_global_slot_since_hard_fork); - - let block_stake_winner = won_slot.delegator.0.clone(); - let vrf_truncated_output: ConsensusVrfOutputTruncatedStableV1 = - (*won_slot.vrf_output).clone().into(); - let vrf_hash = won_slot.vrf_output.hash(); - let block_creator = self.config.pub_key.clone(); - let coinbase_receiver = self.config.coinbase_receiver().clone(); - let proposed_protocol_version_opt = self.config.proposed_protocol_version.clone(); - - let ledger_proof_statement = ledger_proof_statement_from_emitted_proof( - emitted_ledger_proof.as_deref(), - &pred_blockchain_state.ledger_proof_statement, - ); - - let supply_increase = emitted_ledger_proof.as_ref().map_or(Signed::zero(), |v| { - Signed::from(&v.statement.supply_increase) - }); - - let total_currency = { - let (amount, overflowed) = - Amount::from(pred_consensus_state.total_currency.clone()) - .add_signed_flagged(supply_increase); - if overflowed { - todo!("total_currency overflowed"); - } - amount - }; - - let (staking_epoch_data, next_epoch_data, epoch_count) = { - let next_staking_ledger = - if pred_block.snarked_ledger_hash() == genesis_ledger_hash { - pred_consensus_state.next_epoch_data.ledger.clone() - } else { - MinaBaseEpochLedgerValueStableV1 { - hash: pred_block.snarked_ledger_hash().clone(), - total_currency: (&total_currency).into(), - } - }; - let (staking_data, next_data, epoch_count) = if next_epoch > pred_epoch { - let staking_data = - next_to_staking_epoch_data(&pred_consensus_state.next_epoch_data); - let next_data = - ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { - seed: pred_consensus_state.next_epoch_data.seed.clone(), - ledger: next_staking_ledger, - start_checkpoint: pred_block.hash().clone(), - // comment from Mina repo: (* TODO: We need to make sure issue #2328 is properly addressed. *) - lock_checkpoint: StateHash::zero(), - epoch_length: UnsignedExtendedUInt32StableV1(1.into()), - }; - let epoch_count = UnsignedExtendedUInt32StableV1( - (pred_consensus_state.epoch_count.as_u32() + 1).into(), - ); - (staking_data, next_data, epoch_count) - } else { - assert_eq!(pred_epoch, next_epoch); - let mut next_data = pred_consensus_state.next_epoch_data.clone(); - next_data.epoch_length = UnsignedExtendedUInt32StableV1( - (next_data.epoch_length.as_u32() + 1).into(), - ); - ( - pred_consensus_state.staking_epoch_data.clone(), - next_data, - pred_consensus_state.epoch_count, - ) - }; - - let next_data = if in_seed_update_range(next_slot, pred_block.constants()) { - ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { - seed: calc_epoch_seed(&next_data.seed, vrf_hash), - lock_checkpoint: pred_block.hash().clone(), - ..next_data - } - } else { - next_data - }; - - (staking_data, next_data, epoch_count) - }; - - let (min_window_density, sub_window_densities) = { - // TODO(binier): when should this be false? - let incr_window = true; - let pred_sub_window_densities = &pred_consensus_state.sub_window_densities; - - let pred_global_sub_window = - global_sub_window(&pred_global_slot, pred_block.constants()); - let next_global_sub_window = global_sub_window( - &curr_global_slot_since_hard_fork, - pred_block.constants(), - ); - - let pred_relative_sub_window = relative_sub_window(pred_global_sub_window); - let next_relative_sub_window = relative_sub_window(next_global_sub_window); - - let is_same_global_sub_window = - pred_global_sub_window == next_global_sub_window; - let are_windows_overlapping = pred_global_sub_window - + constraint_constants().sub_windows_per_window as u32 - >= next_global_sub_window; - - let current_sub_window_densities = pred_sub_window_densities - .iter() - .enumerate() - .map(|(i, density)| (i as u32, density.as_u32())) - .map(|(i, density)| { - let gt_pred_sub_window = i > pred_relative_sub_window; - let lt_next_sub_window = i < next_relative_sub_window; - let within_range = - if pred_relative_sub_window < next_relative_sub_window { - gt_pred_sub_window && lt_next_sub_window - } else { - gt_pred_sub_window || lt_next_sub_window - }; - if is_same_global_sub_window || are_windows_overlapping && !within_range - { - density - } else { - 0 - } - }) - .collect::>(); - - let grace_period_end = grace_period_end(pred_block.constants()); - let min_window_density = if is_same_global_sub_window - || curr_global_slot_since_hard_fork.slot_number.as_u32() < grace_period_end - { - pred_consensus_state.min_window_density - } else { - let cur_density = current_sub_window_densities.iter().sum(); - let min_density = pred_consensus_state - .min_window_density - .as_u32() - .min(cur_density); - UnsignedExtendedUInt32StableV1(min_density.into()) - }; - - let next_sub_window_densities = current_sub_window_densities - .into_iter() - .enumerate() - .map(|(i, density)| (i as u32, density)) - .map(|(i, density)| { - let is_next_sub_window = i == next_relative_sub_window; - if is_next_sub_window { - let density = if is_same_global_sub_window { - density - } else { - 0 - }; - if incr_window { - density + 1 - } else { - density - } - } else { - density - } - }) - .map(|v| UnsignedExtendedUInt32StableV1(v.into())) - .collect(); - - (min_window_density, next_sub_window_densities) - }; - - let consensus_state = ConsensusProofOfStakeDataConsensusStateValueStableV2 { - blockchain_length: UnsignedExtendedUInt32StableV1( - (pred_block.height() + 1).into(), - ), - epoch_count, - min_window_density, - sub_window_densities, - last_vrf_output: vrf_truncated_output, - total_currency: (&total_currency).into(), - curr_global_slot_since_hard_fork, - global_slot_since_genesis, - staking_epoch_data, - next_epoch_data, - has_ancestor_in_same_checkpoint_window, - block_stake_winner, - block_creator, - coinbase_receiver, - // TODO(binier): Staged_ledger.can_apply_supercharged_coinbase_exn - supercharge_coinbase: constraint_constants().supercharged_coinbase_factor != 0, - }; - - let protocol_state = MinaStateProtocolStateValueStableV2 { - previous_state_hash: pred_block.hash().clone(), - body: MinaStateProtocolStateBodyValueStableV2 { - genesis_state_hash: if pred_block.is_genesis() { - pred_block.hash().clone() - } else { - pred_block - .header() - .protocol_state - .body - .genesis_state_hash - .clone() - }, - constants: pred_block.header().protocol_state.body.constants.clone(), - blockchain_state: MinaStateBlockchainStateValueStableV2 { - staged_ledger_hash: staged_ledger_hash.clone(), - genesis_ledger_hash: genesis_ledger_hash.clone(), - ledger_proof_statement, - timestamp: block_timestamp, - body_reference: diff_hash.clone(), - }, - consensus_state, - }, - }; - - let chain_proof_len = pred_block.constants().delta.as_u32() as usize; - let delta_block_chain_proof = match chain_proof_len { - 0 => (pred_block.hash().clone(), List::new()), - chain_proof_len => { - // TODO(binier): test - let mut iter = chain.iter().rev().take(chain_proof_len + 1).rev(); - if let Some(first_block) = iter.next() { - let first_hash = first_block.hash().clone(); - let body_hashes = iter - .filter_map(|b| b.header().protocol_state.body.try_hash().ok()) // TODO: Handle error ? - .map(StateBodyHash::from) - .collect(); - (first_hash, body_hashes) - } else { - // TODO: test this as well - // If the chain is empty, return the same as when chain_proof_len is 0 - (pred_block.hash().clone(), List::new()) - } - } - }; - - let block = BlockWithoutProof { - protocol_state, - delta_block_chain_proof, - current_protocol_version: pred_block.header().current_protocol_version.clone(), - proposed_protocol_version_opt, - body: StagedLedgerDiffBodyStableV1 { - staged_ledger_diff: diff.clone(), - }, - }; - let Ok(block_hash) = block.protocol_state.try_hash() else { - openmina_core::log::inner::error!("Invalid protocol state"); - return; - }; + state.reduce_block_unproved_build(meta.time()); - self.current = BlockProducerCurrentState::BlockUnprovenBuilt { - time: meta.time(), - won_slot, - chain, - emitted_ledger_proof, - pending_coinbase_update, - pending_coinbase_witness, - stake_proof_sparse_ledger, - block, - block_hash, - } + state_context + .into_dispatcher() + .push(BlockProducerEffectfulAction::BlockUnprovenBuild); + } + BlockProducerAction::BlockProveInit => { + state_context + .into_dispatcher() + .push(BlockProducerEffectfulAction::BlockProveInit); } - BlockProducerAction::BlockProveInit => {} BlockProducerAction::BlockProvePending => { if let BlockProducerCurrentState::BlockUnprovenBuilt { won_slot, @@ -477,9 +248,9 @@ impl BlockProducerEnabled { block, block_hash, .. - } = std::mem::take(&mut self.current) + } = std::mem::take(&mut state.current) { - self.current = BlockProducerCurrentState::BlockProvePending { + state.current = BlockProducerCurrentState::BlockProvePending { time: meta.time(), won_slot, chain, @@ -499,9 +270,9 @@ impl BlockProducerEnabled { block, block_hash, .. - } = std::mem::take(&mut self.current) + } = std::mem::take(&mut state.current) { - self.current = BlockProducerCurrentState::BlockProveSuccess { + state.current = BlockProducerCurrentState::BlockProveSuccess { time: meta.time(), won_slot, chain, @@ -510,6 +281,10 @@ impl BlockProducerEnabled { proof: proof.clone(), }; } + + state_context + .into_dispatcher() + .push(BlockProducerEffectfulAction::BlockProveSuccess); } BlockProducerAction::BlockProduced => { if let BlockProducerCurrentState::BlockProveSuccess { @@ -519,35 +294,424 @@ impl BlockProducerEnabled { block_hash, proof, .. - } = std::mem::take(&mut self.current) + } = std::mem::take(&mut state.current) { - self.current = BlockProducerCurrentState::Produced { + state.current = BlockProducerCurrentState::Produced { time: meta.time(), won_slot, chain, block: block.with_hash_and_proof(block_hash, *proof), }; } + + state_context + .into_dispatcher() + .push(BlockProducerAction::BlockInject); + } + BlockProducerAction::BlockInject => { + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + + let Some((best_tip, root_block, blocks_inbetween)) = None.or_else(|| { + let (best_tip, chain) = state.block_producer.produced_block_with_chain()?; + let mut iter = chain.iter(); + let root_block = iter.next()?.block_with_hash(); + let blocks_inbetween = iter.map(|b| b.hash().clone()).collect(); + Some((best_tip.clone(), root_block.clone(), blocks_inbetween)) + }) else { + return; + }; + + let previous_root_snarked_ledger_hash = state + .transition_frontier + .root() + .map(|b| b.snarked_ledger_hash().clone()); + + dispatcher.push(TransitionFrontierSyncAction::BestTipUpdate { + previous_root_snarked_ledger_hash, + best_tip: best_tip.clone(), + root_block, + blocks_inbetween, + on_success: Some(callback!( + on_transition_frontier_sync_best_tip_update(_p: ()) -> crate::Action{ + BlockProducerAction::BlockInjected + } + )), + }); } - BlockProducerAction::BlockInject => {} BlockProducerAction::BlockInjected => { if let BlockProducerCurrentState::Produced { won_slot, chain, block, .. - } = &mut self.current + } = &mut state.current { - self.injected_blocks.insert(block.hash().clone()); - self.current = BlockProducerCurrentState::Injected { + state.injected_blocks.insert(block.hash().clone()); + state.current = BlockProducerCurrentState::Injected { time: meta.time(), won_slot: won_slot.clone(), chain: std::mem::take(chain), block: block.clone(), }; } + + state_context + .into_dispatcher() + .push(BlockProducerAction::WonSlotSearch); + } + } + } + + fn reduce_block_unproved_build(&mut self, time: Timestamp) { + let BlockProducerCurrentState::StagedLedgerDiffCreateSuccess { + won_slot, + chain, + diff, + diff_hash, + staged_ledger_hash, + emitted_ledger_proof, + pending_coinbase_update, + pending_coinbase_witness, + stake_proof_sparse_ledger, + .. + } = std::mem::take(&mut self.current) + else { + return; + }; + let Some(pred_block) = chain.last() else { + return; + }; + + let pred_consensus_state = &pred_block.header().protocol_state.body.consensus_state; + let pred_blockchain_state = &pred_block.header().protocol_state.body.blockchain_state; + + let genesis_ledger_hash = &pred_blockchain_state.genesis_ledger_hash; + + let block_timestamp = won_slot.timestamp(); + let pred_global_slot = pred_consensus_state + .curr_global_slot_since_hard_fork + .clone(); + let curr_global_slot_since_hard_fork = won_slot.global_slot.clone(); + let global_slot_since_genesis = + won_slot.global_slot_since_genesis(pred_block.global_slot_diff()); + let (pred_epoch, _) = to_epoch_and_slot(&pred_global_slot); + let (next_epoch, next_slot) = to_epoch_and_slot(&curr_global_slot_since_hard_fork); + let has_ancestor_in_same_checkpoint_window = + in_same_checkpoint_window(&pred_global_slot, &curr_global_slot_since_hard_fork); + + let block_stake_winner = won_slot.delegator.0.clone(); + let vrf_truncated_output: ConsensusVrfOutputTruncatedStableV1 = + (*won_slot.vrf_output).clone().into(); + let vrf_hash = won_slot.vrf_output.hash(); + let block_creator = self.config.pub_key.clone(); + let coinbase_receiver = self.config.coinbase_receiver().clone(); + let proposed_protocol_version_opt = self.config.proposed_protocol_version.clone(); + + let ledger_proof_statement = ledger_proof_statement_from_emitted_proof( + emitted_ledger_proof.as_deref(), + &pred_blockchain_state.ledger_proof_statement, + ); + + let supply_increase = emitted_ledger_proof.as_ref().map_or(Signed::zero(), |v| { + Signed::from(&v.statement.supply_increase) + }); + + let total_currency = { + let (amount, overflowed) = Amount::from(pred_consensus_state.total_currency.clone()) + .add_signed_flagged(supply_increase); + if overflowed { + todo!("total_currency overflowed"); + } + amount + }; + + let (staking_epoch_data, next_epoch_data, epoch_count) = { + let next_staking_ledger = if pred_block.snarked_ledger_hash() == genesis_ledger_hash { + pred_consensus_state.next_epoch_data.ledger.clone() + } else { + MinaBaseEpochLedgerValueStableV1 { + hash: pred_block.snarked_ledger_hash().clone(), + total_currency: (&total_currency).into(), + } + }; + let (staking_data, next_data, epoch_count) = if next_epoch > pred_epoch { + let staking_data = + next_to_staking_epoch_data(&pred_consensus_state.next_epoch_data); + let next_data = ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { + seed: pred_consensus_state.next_epoch_data.seed.clone(), + ledger: next_staking_ledger, + start_checkpoint: pred_block.hash().clone(), + // comment from Mina repo: (* TODO: We need to make sure issue #2328 is properly addressed. *) + lock_checkpoint: StateHash::zero(), + epoch_length: UnsignedExtendedUInt32StableV1(1.into()), + }; + let epoch_count = UnsignedExtendedUInt32StableV1( + (pred_consensus_state.epoch_count.as_u32() + 1).into(), + ); + (staking_data, next_data, epoch_count) + } else { + assert_eq!(pred_epoch, next_epoch); + let mut next_data = pred_consensus_state.next_epoch_data.clone(); + next_data.epoch_length = + UnsignedExtendedUInt32StableV1((next_data.epoch_length.as_u32() + 1).into()); + ( + pred_consensus_state.staking_epoch_data.clone(), + next_data, + pred_consensus_state.epoch_count, + ) + }; + + let next_data = if in_seed_update_range(next_slot, pred_block.constants()) { + ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { + seed: calc_epoch_seed(&next_data.seed, vrf_hash), + lock_checkpoint: pred_block.hash().clone(), + ..next_data + } + } else { + next_data + }; + + (staking_data, next_data, epoch_count) + }; + + let (min_window_density, sub_window_densities) = { + // TODO(binier): when should this be false? + let incr_window = true; + let pred_sub_window_densities = &pred_consensus_state.sub_window_densities; + + let pred_global_sub_window = + global_sub_window(&pred_global_slot, pred_block.constants()); + let next_global_sub_window = + global_sub_window(&curr_global_slot_since_hard_fork, pred_block.constants()); + + let pred_relative_sub_window = relative_sub_window(pred_global_sub_window); + let next_relative_sub_window = relative_sub_window(next_global_sub_window); + + let is_same_global_sub_window = pred_global_sub_window == next_global_sub_window; + let are_windows_overlapping = pred_global_sub_window + + constraint_constants().sub_windows_per_window as u32 + >= next_global_sub_window; + + let current_sub_window_densities = pred_sub_window_densities + .iter() + .enumerate() + .map(|(i, density)| (i as u32, density.as_u32())) + .map(|(i, density)| { + let gt_pred_sub_window = i > pred_relative_sub_window; + let lt_next_sub_window = i < next_relative_sub_window; + let within_range = if pred_relative_sub_window < next_relative_sub_window { + gt_pred_sub_window && lt_next_sub_window + } else { + gt_pred_sub_window || lt_next_sub_window + }; + if is_same_global_sub_window || are_windows_overlapping && !within_range { + density + } else { + 0 + } + }) + .collect::>(); + + let grace_period_end = grace_period_end(pred_block.constants()); + let min_window_density = if is_same_global_sub_window + || curr_global_slot_since_hard_fork.slot_number.as_u32() < grace_period_end + { + pred_consensus_state.min_window_density + } else { + let cur_density = current_sub_window_densities.iter().sum(); + let min_density = pred_consensus_state + .min_window_density + .as_u32() + .min(cur_density); + UnsignedExtendedUInt32StableV1(min_density.into()) + }; + + let next_sub_window_densities = current_sub_window_densities + .into_iter() + .enumerate() + .map(|(i, density)| (i as u32, density)) + .map(|(i, density)| { + let is_next_sub_window = i == next_relative_sub_window; + if is_next_sub_window { + let density = if is_same_global_sub_window { + density + } else { + 0 + }; + if incr_window { + density + 1 + } else { + density + } + } else { + density + } + }) + .map(|v| UnsignedExtendedUInt32StableV1(v.into())) + .collect(); + + (min_window_density, next_sub_window_densities) + }; + + let consensus_state = ConsensusProofOfStakeDataConsensusStateValueStableV2 { + blockchain_length: UnsignedExtendedUInt32StableV1((pred_block.height() + 1).into()), + epoch_count, + min_window_density, + sub_window_densities, + last_vrf_output: vrf_truncated_output, + total_currency: (&total_currency).into(), + curr_global_slot_since_hard_fork, + global_slot_since_genesis, + staking_epoch_data, + next_epoch_data, + has_ancestor_in_same_checkpoint_window, + block_stake_winner, + block_creator, + coinbase_receiver, + // TODO(binier): Staged_ledger.can_apply_supercharged_coinbase_exn + supercharge_coinbase: constraint_constants().supercharged_coinbase_factor != 0, + }; + + let protocol_state = MinaStateProtocolStateValueStableV2 { + previous_state_hash: pred_block.hash().clone(), + body: MinaStateProtocolStateBodyValueStableV2 { + genesis_state_hash: if pred_block.is_genesis() { + pred_block.hash().clone() + } else { + pred_block + .header() + .protocol_state + .body + .genesis_state_hash + .clone() + }, + constants: pred_block.header().protocol_state.body.constants.clone(), + blockchain_state: MinaStateBlockchainStateValueStableV2 { + staged_ledger_hash: staged_ledger_hash.clone(), + genesis_ledger_hash: genesis_ledger_hash.clone(), + ledger_proof_statement, + timestamp: block_timestamp, + body_reference: diff_hash.clone(), + }, + consensus_state, + }, + }; + + let chain_proof_len = pred_block.constants().delta.as_u32() as usize; + let delta_block_chain_proof = match chain_proof_len { + 0 => (pred_block.hash().clone(), List::new()), + chain_proof_len => { + // TODO(binier): test + let mut iter = chain.iter().rev().take(chain_proof_len + 1).rev(); + if let Some(first_block) = iter.next() { + let first_hash = first_block.hash().clone(); + let body_hashes = iter + .filter_map(|b| b.header().protocol_state.body.try_hash().ok()) // TODO: Handle error ? + .map(StateBodyHash::from) + .collect(); + (first_hash, body_hashes) + } else { + // TODO: test this as well + // If the chain is empty, return the same as when chain_proof_len is 0 + (pred_block.hash().clone(), List::new()) + } + } + }; + + let block = BlockWithoutProof { + protocol_state, + delta_block_chain_proof, + current_protocol_version: pred_block.header().current_protocol_version.clone(), + proposed_protocol_version_opt, + body: StagedLedgerDiffBodyStableV1 { + staged_ledger_diff: diff.clone(), + }, + }; + let Ok(block_hash) = block.protocol_state.try_hash() else { + openmina_core::log::inner::error!("Invalid protocol state"); + return; + }; + + self.current = BlockProducerCurrentState::BlockUnprovenBuilt { + time, + won_slot, + chain, + emitted_ledger_proof, + pending_coinbase_update, + pending_coinbase_witness, + stake_proof_sparse_ledger, + block, + block_hash, + }; + } + + fn dispatch_best_tip_update( + dispatcher: &mut Dispatcher, + state: &State, + best_tip: &ArcBlockWithHash, + ) { + let global_slot = best_tip + .consensus_state() + .curr_global_slot_since_hard_fork + .clone(); + + let (best_tip_epoch, best_tip_slot) = to_epoch_and_slot(&global_slot); + let root_block_epoch = if let Some(root_block) = state.transition_frontier.root() { + let root_block_global_slot = root_block.curr_global_slot_since_hard_fork(); + to_epoch_and_slot(root_block_global_slot).0 + } else { + bug_condition!("Expected to find a block at the root of the transition frontier but there was none"); + best_tip_epoch.saturating_sub(1) + }; + let next_epoch_first_slot = next_epoch_first_slot(&global_slot); + let current_epoch = state.current_epoch(); + let current_slot = state.current_slot(); + + dispatcher.push(BlockProducerVrfEvaluatorAction::InitializeEvaluator { + best_tip: best_tip.clone(), + }); + + // None if the evaluator is not evaluating + let currenty_evaluated_epoch = state + .block_producer + .vrf_evaluator() + .and_then(|vrf_evaluator| vrf_evaluator.currently_evaluated_epoch()); + + if let Some(currently_evaluated_epoch) = currenty_evaluated_epoch { + // if we receive a block with higher epoch than the current one, interrupt the evaluation + if currently_evaluated_epoch < best_tip_epoch { + dispatcher.push(BlockProducerVrfEvaluatorAction::InterruptEpochEvaluation { + reason: InterruptReason::BestTipWithHigherEpoch, + }); } } + + let is_next_epoch_seed_finalized = if let Some(current_slot) = current_slot { + !in_seed_update_range(current_slot, best_tip.constants()) + } else { + false + }; + + dispatcher.push(BlockProducerVrfEvaluatorAction::CheckEpochEvaluability { + current_epoch, + is_next_epoch_seed_finalized, + root_block_epoch, + best_tip_epoch, + best_tip_slot, + best_tip_global_slot: best_tip.global_slot(), + next_epoch_first_slot, + staking_epoch_data: Box::new(best_tip.consensus_state().staking_epoch_data.clone()), + next_epoch_data: Box::new(best_tip.consensus_state().next_epoch_data.clone()), + }); + + if let Some(reason) = state + .block_producer + .with(None, |bp| bp.current.won_slot_should_discard(best_tip)) + { + dispatcher.push(BlockProducerAction::WonSlotDiscard { reason }); + } else { + dispatcher.push(BlockProducerAction::WonSlotSearch); + } } } diff --git a/node/src/block_producer/block_producer_state.rs b/node/src/block_producer/block_producer_state.rs index 015b4aa2e0..69c7405a03 100644 --- a/node/src/block_producer/block_producer_state.rs +++ b/node/src/block_producer/block_producer_state.rs @@ -135,7 +135,7 @@ pub enum BlockProducerCurrentState { }, } -#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)] +#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone, Copy)] pub enum BlockProducerWonSlotDiscardReason { BestTipStakingLedgerDifferent, BestTipGlobalSlotHigher, @@ -152,20 +152,19 @@ impl BlockProducerState { })) } - #[inline(always)] - pub(super) fn with<'a, F, R: 'a>(&'a self, default: R, fun: F) -> R + pub fn with<'a, F, R: 'a>(&'a self, default: R, fun: F) -> R where F: FnOnce(&'a BlockProducerEnabled) -> R, { self.0.as_ref().map_or(default, fun) } - #[inline(always)] - pub(super) fn with_mut(&mut self, default: R, fun: F) -> R - where - F: FnOnce(&mut BlockProducerEnabled) -> R, - { - self.0.as_mut().map_or(default, fun) + pub fn as_mut(&mut self) -> Option<&mut BlockProducerEnabled> { + self.0.as_mut() + } + + pub fn as_ref(&self) -> Option<&BlockProducerEnabled> { + self.0.as_ref() } pub fn is_enabled(&self) -> bool { diff --git a/node/src/block_producer/mod.rs b/node/src/block_producer/mod.rs index ba0008c70a..e0fd494eb1 100644 --- a/node/src/block_producer/mod.rs +++ b/node/src/block_producer/mod.rs @@ -14,12 +14,6 @@ pub use block_producer_actions::*; mod block_producer_reducer; -mod block_producer_effects; -pub use block_producer_effects::*; - -mod block_producer_service; -pub use block_producer_service::*; - use ledger::AccountIndex; use mina_p2p_messages::{list::List, v2}; use openmina_core::block::ArcBlockWithHash; diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_effects.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_effects.rs deleted file mode 100644 index 0127e3eb71..0000000000 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_effects.rs +++ /dev/null @@ -1,238 +0,0 @@ -use redux::ActionMeta; - -use crate::block_producer::to_epoch_and_slot; -use crate::ledger::read::LedgerReadAction; -use crate::ledger::read::LedgerReadInitCallback; -use crate::ledger::read::LedgerReadRequest; -use crate::Service; -use crate::Store; - -use super::BlockProducerVrfEvaluatorAction; -use super::BlockProducerVrfEvaluatorStatus; -use super::SlotPositionInEpoch; - -impl BlockProducerVrfEvaluatorAction { - pub fn effects(self, _: &ActionMeta, store: &mut Store) { - match self { - BlockProducerVrfEvaluatorAction::EvaluateSlot { vrf_input } => { - store.service.evaluate(vrf_input); - } - BlockProducerVrfEvaluatorAction::ProcessSlotEvaluationSuccess { - vrf_output, .. - } => { - if let Some(vrf_evaluator_state) = store.state().block_producer.vrf_evaluator() { - if let Some(pending_evaluation) = vrf_evaluator_state.current_evaluation() { - store.dispatch(BlockProducerVrfEvaluatorAction::CheckEpochBounds { - epoch_number: pending_evaluation.epoch_number, - latest_evaluated_global_slot: vrf_output.global_slot(), - }); - } - } - } - BlockProducerVrfEvaluatorAction::CheckEpochBounds { - latest_evaluated_global_slot, - epoch_number, - } => { - if let Some(epoch_bound) = store - .state() - .block_producer - .vrf_evaluator() - .and_then(|s| s.get_epoch_bound_from_check()) - { - match epoch_bound { - SlotPositionInEpoch::Beginning | SlotPositionInEpoch::Within => { - store.dispatch( - BlockProducerVrfEvaluatorAction::ContinueEpochEvaluation { - latest_evaluated_global_slot, - epoch_number, - }, - ); - } - SlotPositionInEpoch::End => { - store.dispatch( - BlockProducerVrfEvaluatorAction::FinishEpochEvaluation { - latest_evaluated_global_slot, - epoch_number, - }, - ); - } - } - } - } - BlockProducerVrfEvaluatorAction::InitializeEvaluator { best_tip } => { - // Note: pure function, but needs access to other parts of the state - if store.state().block_producer.vrf_evaluator().is_some() { - if best_tip.consensus_state().epoch_count.as_u32() == 0 { - store.dispatch( - BlockProducerVrfEvaluatorAction::FinalizeEvaluatorInitialization { - previous_epoch_and_height: None, - }, - ); - } else { - let k = best_tip.constants().k.as_u32(); - let (epoch, slot) = to_epoch_and_slot( - &best_tip.consensus_state().curr_global_slot_since_hard_fork, - ); - let previous_epoch = epoch.saturating_sub(1); - let last_height = if slot < k { - let found = store - .state() - .transition_frontier - .best_chain - .iter() - .rev() - .find(|b| { - b.consensus_state().epoch_count.as_u32() == previous_epoch - }); - - if let Some(block) = found { - block.height() - } else { - Default::default() - } - } else if let Some(root_block) = store.state().transition_frontier.root() { - root_block.height() - } else { - Default::default() - }; - store.dispatch( - BlockProducerVrfEvaluatorAction::FinalizeEvaluatorInitialization { - previous_epoch_and_height: Some((previous_epoch, last_height)), - }, - ); - } - } - } - BlockProducerVrfEvaluatorAction::FinalizeEvaluatorInitialization { .. } => {} - BlockProducerVrfEvaluatorAction::CheckEpochEvaluability { - root_block_epoch: _, - best_tip_global_slot, - best_tip_epoch, - best_tip_slot, - next_epoch_first_slot, - current_epoch: _, - is_next_epoch_seed_finalized: _, - staking_epoch_data: _, - next_epoch_data: _, - } => { - let vrf_evaluator_state = store.state().block_producer.vrf_evaluator_with_config(); - - if let Some((vrf_evaluator_state, config)) = vrf_evaluator_state { - if let Some(epoch_data) = vrf_evaluator_state.epoch_context().get_epoch_data() { - store.dispatch( - BlockProducerVrfEvaluatorAction::InitializeEpochEvaluation { - staking_epoch_data: epoch_data, - producer: config.pub_key.clone().into(), - best_tip_global_slot, - best_tip_epoch, - best_tip_slot, - next_epoch_first_slot, - }, - ); - } else { - // If None is returned, than we are waiting for evaluation - store.dispatch(BlockProducerVrfEvaluatorAction::WaitForNextEvaluation); - } - - store.dispatch(BlockProducerVrfEvaluatorAction::CleanupOldSlots { - best_tip_epoch, - }); - } - } - BlockProducerVrfEvaluatorAction::InitializeEpochEvaluation { .. } => { - store.dispatch(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); - } - BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction => { - let (staking_ledger_hash, producer) = - match store.state().block_producer.vrf_delegator_table_inputs() { - Some((v1, v2)) => (v1.clone(), v2.clone()), - None => return, - }; - if store.dispatch(LedgerReadAction::Init { - request: LedgerReadRequest::DelegatorTable(staking_ledger_hash, producer), - callback: LedgerReadInitCallback::None, - }) { - // TODO(binier): have pending action. - } else { - unreachable!() - } - } - BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { .. } => { - let Some(( - current_global_slot, - BlockProducerVrfEvaluatorStatus::EpochDelegatorTableSuccess { - best_tip_epoch, - best_tip_slot, - best_tip_global_slot, - next_epoch_first_slot, - staking_epoch_data, - .. - }, - )) = None.or_else(|| { - let cur_global_slot = store.state().cur_global_slot()?; - let status = &store.state().block_producer.vrf_evaluator()?.status; - - Some((cur_global_slot, status)) - }) - else { - // error here! - return; - }; - - store.dispatch(BlockProducerVrfEvaluatorAction::SelectInitialSlot { - current_global_slot, - best_tip_epoch: *best_tip_epoch, - best_tip_slot: *best_tip_slot, - best_tip_global_slot: *best_tip_global_slot, - next_epoch_first_slot: *next_epoch_first_slot, - staking_epoch_data: staking_epoch_data.clone(), - }); - } - BlockProducerVrfEvaluatorAction::BeginEpochEvaluation { - latest_evaluated_global_slot, - best_tip_epoch: current_epoch_number, - .. - } => { - if store.state().block_producer.vrf_evaluator().is_some() { - store.dispatch(BlockProducerVrfEvaluatorAction::ContinueEpochEvaluation { - latest_evaluated_global_slot, - epoch_number: current_epoch_number, - }); - } - } - BlockProducerVrfEvaluatorAction::ContinueEpochEvaluation { .. } => { - if let Some(vrf_evaluator_state) = store.state().block_producer.vrf_evaluator() { - if let Some(vrf_input) = vrf_evaluator_state.construct_vrf_input() { - store.dispatch(BlockProducerVrfEvaluatorAction::EvaluateSlot { vrf_input }); - } - } - } - BlockProducerVrfEvaluatorAction::FinishEpochEvaluation { .. } => {} - BlockProducerVrfEvaluatorAction::WaitForNextEvaluation { .. } => {} - BlockProducerVrfEvaluatorAction::SelectInitialSlot { - best_tip_epoch: current_epoch_number, - best_tip_global_slot: current_best_tip_global_slot, - best_tip_slot: current_best_tip_slot, - staking_epoch_data, - .. - } => { - if let Some(initial_slot) = store - .state() - .block_producer - .vrf_evaluator() - .and_then(|v| v.initial_slot()) - { - store.dispatch(BlockProducerVrfEvaluatorAction::BeginEpochEvaluation { - best_tip_epoch: current_epoch_number, - best_tip_global_slot: current_best_tip_global_slot, - best_tip_slot: current_best_tip_slot, - staking_epoch_data, - latest_evaluated_global_slot: initial_slot, - }); - } - } - BlockProducerVrfEvaluatorAction::CleanupOldSlots { .. } => {} - BlockProducerVrfEvaluatorAction::InterruptEpochEvaluation { .. } => {} - } - } -} diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs index 37b53fb660..420c2c8925 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs @@ -1,18 +1,40 @@ +use vrf::VrfEvaluationOutput; + +use crate::{ + block_producer::to_epoch_and_slot, + block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorEffectfulAction, + ledger::read::{LedgerReadAction, LedgerReadInitCallback, LedgerReadRequest}, + BlockProducerAction, Substate, +}; + use super::{ BlockProducerVrfEvaluatorAction, BlockProducerVrfEvaluatorActionWithMetaRef, BlockProducerVrfEvaluatorState, BlockProducerVrfEvaluatorStatus, PendingEvaluation, - VrfWonSlotWithHash, + SlotPositionInEpoch, VrfWonSlotWithHash, }; impl BlockProducerVrfEvaluatorState { - pub fn reducer(&mut self, action: BlockProducerVrfEvaluatorActionWithMetaRef<'_>) { + pub fn reducer( + mut state_context: Substate, + action: BlockProducerVrfEvaluatorActionWithMetaRef<'_>, + ) { + let Ok(state) = state_context.get_substate_mut() else { + return; + }; + let (action, meta) = action.split(); match action { BlockProducerVrfEvaluatorAction::EvaluateSlot { vrf_input } => { - self.status = BlockProducerVrfEvaluatorStatus::SlotEvaluationPending { + state.status = BlockProducerVrfEvaluatorStatus::SlotEvaluationPending { time: meta.time(), global_slot: vrf_input.global_slot, }; + + state_context.into_dispatcher().push( + BlockProducerVrfEvaluatorEffectfulAction::EvaluateSlot { + vrf_input: vrf_input.clone(), + }, + ); } BlockProducerVrfEvaluatorAction::ProcessSlotEvaluationSuccess { vrf_output, @@ -20,7 +42,7 @@ impl BlockProducerVrfEvaluatorState { } => { let global_slot_evaluated = match &vrf_output { vrf::VrfEvaluationOutput::SlotWon(won_slot_data) => { - self.won_slots.insert( + state.won_slots.insert( won_slot_data.global_slot, VrfWonSlotWithHash::new( won_slot_data.clone(), @@ -31,36 +53,122 @@ impl BlockProducerVrfEvaluatorState { } vrf::VrfEvaluationOutput::SlotLost(global_slot) => *global_slot, }; - self.set_latest_evaluated_global_slot(&global_slot_evaluated); + state.set_latest_evaluated_global_slot(&global_slot_evaluated); - self.status = BlockProducerVrfEvaluatorStatus::SlotEvaluationReceived { + state.status = BlockProducerVrfEvaluatorStatus::SlotEvaluationReceived { time: meta.time(), global_slot: global_slot_evaluated, + }; + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + + if let Some(vrf_evaluator_state) = state.block_producer.vrf_evaluator() { + if let Some(pending_evaluation) = vrf_evaluator_state.current_evaluation() { + dispatcher.push(BlockProducerVrfEvaluatorAction::CheckEpochBounds { + epoch_number: pending_evaluation.epoch_number, + latest_evaluated_global_slot: vrf_output.global_slot(), + }); + } + } + + if matches!(vrf_output, VrfEvaluationOutput::SlotWon(_)) { + dispatcher.push(BlockProducerAction::WonSlotSearch); } } BlockProducerVrfEvaluatorAction::CheckEpochBounds { epoch_number, latest_evaluated_global_slot, } => { - let epoch_current_bound = Self::evaluate_epoch_bounds(latest_evaluated_global_slot); - self.status = BlockProducerVrfEvaluatorStatus::EpochBoundsCheck { + let latest_evaluated_global_slot = *latest_evaluated_global_slot; + let epoch_number = *epoch_number; + + let epoch_current_bound = + Self::evaluate_epoch_bounds(&latest_evaluated_global_slot); + state.status = BlockProducerVrfEvaluatorStatus::EpochBoundsCheck { time: meta.time(), - epoch_number: *epoch_number, - latest_evaluated_global_slot: *latest_evaluated_global_slot, + epoch_number, + latest_evaluated_global_slot, epoch_current_bound, }; + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + + if let Some(epoch_bound) = state + .block_producer + .vrf_evaluator() + .and_then(|s| s.get_epoch_bound_from_check()) + { + match epoch_bound { + SlotPositionInEpoch::Beginning | SlotPositionInEpoch::Within => { + dispatcher.push( + BlockProducerVrfEvaluatorAction::ContinueEpochEvaluation { + latest_evaluated_global_slot, + epoch_number, + }, + ); + } + SlotPositionInEpoch::End => { + dispatcher.push( + BlockProducerVrfEvaluatorAction::FinishEpochEvaluation { + latest_evaluated_global_slot, + epoch_number, + }, + ); + } + } + } } - BlockProducerVrfEvaluatorAction::InitializeEvaluator { .. } => { - self.status = - BlockProducerVrfEvaluatorStatus::InitialisationPending { time: meta.time() } + BlockProducerVrfEvaluatorAction::InitializeEvaluator { best_tip } => { + state.status = + BlockProducerVrfEvaluatorStatus::InitialisationPending { time: meta.time() }; + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + + // Note: pure function, but needs access to other parts of the state + if state.block_producer.vrf_evaluator().is_some() { + if best_tip.consensus_state().epoch_count.as_u32() == 0 { + dispatcher.push( + BlockProducerVrfEvaluatorAction::FinalizeEvaluatorInitialization { + previous_epoch_and_height: None, + }, + ); + } else { + let k = best_tip.constants().k.as_u32(); + let (epoch, slot) = to_epoch_and_slot( + &best_tip.consensus_state().curr_global_slot_since_hard_fork, + ); + let previous_epoch = epoch.saturating_sub(1); + let last_height = if slot < k { + let found = + state.transition_frontier.best_chain.iter().rev().find(|b| { + b.consensus_state().epoch_count.as_u32() == previous_epoch + }); + + if let Some(block) = found { + block.height() + } else { + Default::default() + } + } else if let Some(root_block) = state.transition_frontier.root() { + root_block.height() + } else { + Default::default() + }; + dispatcher.push( + BlockProducerVrfEvaluatorAction::FinalizeEvaluatorInitialization { + previous_epoch_and_height: Some((previous_epoch, last_height)), + }, + ); + } + } } BlockProducerVrfEvaluatorAction::FinalizeEvaluatorInitialization { previous_epoch_and_height, } => { if let Some((epoch, last_height)) = previous_epoch_and_height { - self.initialize_evaluator(*epoch, *last_height); + state.initialize_evaluator(*epoch, *last_height); } - self.status = + state.status = BlockProducerVrfEvaluatorStatus::InitialisationComplete { time: meta.time() } } BlockProducerVrfEvaluatorAction::CheckEpochEvaluability { @@ -70,24 +178,50 @@ impl BlockProducerVrfEvaluatorState { root_block_epoch, staking_epoch_data, next_epoch_data, - best_tip_slot: _, - best_tip_global_slot: _, - next_epoch_first_slot: _, + best_tip_slot, + best_tip_global_slot, + next_epoch_first_slot, } => { - self.status = BlockProducerVrfEvaluatorStatus::ReadinessCheck { + let best_tip_epoch = *best_tip_epoch; + + state.status = BlockProducerVrfEvaluatorStatus::ReadinessCheck { time: meta.time(), current_epoch: *current_epoch, is_next_epoch_seed_finalized: *is_next_epoch_seed_finalized, - best_tip_epoch: *best_tip_epoch, + best_tip_epoch, root_block_epoch: *root_block_epoch, - is_current_epoch_evaluated: self.is_epoch_evaluated(*best_tip_epoch), - is_next_epoch_evaluated: self.is_epoch_evaluated(best_tip_epoch + 1), - last_evaluated_epoch: self.last_evaluated_epoch(), + is_current_epoch_evaluated: state.is_epoch_evaluated(best_tip_epoch), + is_next_epoch_evaluated: state.is_epoch_evaluated(best_tip_epoch + 1), + last_evaluated_epoch: state.last_evaluated_epoch(), staking_epoch_data: staking_epoch_data.clone(), next_epoch_data: next_epoch_data.clone(), }; - self.set_epoch_context(); + state.set_epoch_context(); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let vrf_evaluator_state = state.block_producer.vrf_evaluator_with_config(); + + if let Some((vrf_evaluator_state, config)) = vrf_evaluator_state { + if let Some(epoch_data) = vrf_evaluator_state.epoch_context().get_epoch_data() { + dispatcher.push( + BlockProducerVrfEvaluatorAction::InitializeEpochEvaluation { + staking_epoch_data: epoch_data, + producer: config.pub_key.clone().into(), + best_tip_global_slot: *best_tip_global_slot, + best_tip_epoch, + best_tip_slot: *best_tip_slot, + next_epoch_first_slot: *next_epoch_first_slot, + }, + ); + } else { + // If None is returned, than we are waiting for evaluation + dispatcher.push(BlockProducerVrfEvaluatorAction::WaitForNextEvaluation); + } + + dispatcher + .push(BlockProducerVrfEvaluatorAction::CleanupOldSlots { best_tip_epoch }); + } } BlockProducerVrfEvaluatorAction::InitializeEpochEvaluation { best_tip_epoch, @@ -97,17 +231,21 @@ impl BlockProducerVrfEvaluatorState { staking_epoch_data, producer, } => { - self.status = BlockProducerVrfEvaluatorStatus::ReadyToEvaluate { + state.status = BlockProducerVrfEvaluatorStatus::ReadyToEvaluate { time: meta.time(), best_tip_epoch: *best_tip_epoch, - is_current_epoch_evaluated: self.is_epoch_evaluated(*best_tip_epoch), - is_next_epoch_evaluated: self.is_epoch_evaluated(best_tip_epoch + 1), + is_current_epoch_evaluated: state.is_epoch_evaluated(*best_tip_epoch), + is_next_epoch_evaluated: state.is_epoch_evaluated(best_tip_epoch + 1), best_tip_slot: *best_tip_slot, best_tip_global_slot: *best_tip_global_slot, next_epoch_first_slot: *next_epoch_first_slot, staking_epoch_data: staking_epoch_data.clone(), producer: producer.clone(), - } + }; + + state_context + .into_dispatcher() + .push(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); } BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction => { let BlockProducerVrfEvaluatorStatus::ReadyToEvaluate { @@ -120,11 +258,11 @@ impl BlockProducerVrfEvaluatorState { time: _, is_current_epoch_evaluated: _, is_next_epoch_evaluated: _, - } = &self.status + } = &state.status else { return; }; - self.status = BlockProducerVrfEvaluatorStatus::EpochDelegatorTablePending { + state.status = BlockProducerVrfEvaluatorStatus::EpochDelegatorTablePending { time: meta.time(), best_tip_epoch: *best_tip_epoch, staking_epoch_ledger_hash: staking_epoch_data.ledger.clone(), @@ -133,7 +271,19 @@ impl BlockProducerVrfEvaluatorState { next_epoch_first_slot: *next_epoch_first_slot, staking_epoch_data: staking_epoch_data.clone(), producer: producer.clone(), - } + }; + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let (staking_ledger_hash, producer) = + match state.block_producer.vrf_delegator_table_inputs() { + Some((v1, v2)) => (v1.clone(), v2.clone()), + None => return, + }; + + dispatcher.push(LedgerReadAction::Init { + request: LedgerReadRequest::DelegatorTable(staking_ledger_hash, producer), + callback: LedgerReadInitCallback::None, + }) } BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { delegator_table, @@ -147,7 +297,7 @@ impl BlockProducerVrfEvaluatorState { producer, time: _, staking_epoch_ledger_hash: _, - } = &self.status + } = &state.status else { return; }; @@ -155,7 +305,7 @@ impl BlockProducerVrfEvaluatorState { let mut staking_epoch_data = staking_epoch_data.clone(); staking_epoch_data.delegator_table = delegator_table.clone(); - self.status = BlockProducerVrfEvaluatorStatus::EpochDelegatorTableSuccess { + state.status = BlockProducerVrfEvaluatorStatus::EpochDelegatorTableSuccess { time: meta.time(), best_tip_epoch: *best_tip_epoch, staking_epoch_ledger_hash: staking_epoch_data.ledger.clone(), @@ -164,7 +314,40 @@ impl BlockProducerVrfEvaluatorState { next_epoch_first_slot: *next_epoch_first_slot, staking_epoch_data: staking_epoch_data.clone(), producer: producer.clone(), - } + }; + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let get_slot_and_status = || { + let cur_global_slot = state.cur_global_slot()?; + let status = &state.block_producer.vrf_evaluator()?.status; + + Some((cur_global_slot, status)) + }; + + let Some(( + current_global_slot, + BlockProducerVrfEvaluatorStatus::EpochDelegatorTableSuccess { + best_tip_epoch, + best_tip_slot, + best_tip_global_slot, + next_epoch_first_slot, + staking_epoch_data, + .. + }, + )) = get_slot_and_status() + else { + // error here! + return; + }; + + dispatcher.push(BlockProducerVrfEvaluatorAction::SelectInitialSlot { + current_global_slot, + best_tip_epoch: *best_tip_epoch, + best_tip_slot: *best_tip_slot, + best_tip_global_slot: *best_tip_global_slot, + next_epoch_first_slot: *next_epoch_first_slot, + staking_epoch_data: staking_epoch_data.clone(), + }); } BlockProducerVrfEvaluatorAction::BeginEpochEvaluation { best_tip_epoch, @@ -173,28 +356,47 @@ impl BlockProducerVrfEvaluatorState { best_tip_slot: _, best_tip_global_slot: _, } => { - self.set_pending_evaluation(PendingEvaluation { - epoch_number: *best_tip_epoch, + let latest_evaluated_global_slot = *latest_evaluated_global_slot; + let epoch_number = *best_tip_epoch; + + state.set_pending_evaluation(PendingEvaluation { + epoch_number, epoch_data: staking_epoch_data.clone(), - latest_evaluated_slot: *latest_evaluated_global_slot, + latest_evaluated_slot: latest_evaluated_global_slot, }); - self.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationPending { + state.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationPending { time: meta.time(), - epoch_number: *best_tip_epoch, + epoch_number, epoch_data: staking_epoch_data.clone(), - latest_evaluated_global_slot: *latest_evaluated_global_slot, + latest_evaluated_global_slot, + }; + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + if state.block_producer.vrf_evaluator().is_some() { + dispatcher.push(BlockProducerVrfEvaluatorAction::ContinueEpochEvaluation { + latest_evaluated_global_slot, + epoch_number, + }); } } BlockProducerVrfEvaluatorAction::ContinueEpochEvaluation { epoch_number, latest_evaluated_global_slot, } => { - if let Some(pending_evaluation) = self.current_evaluation() { - self.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationPending { + if let Some(pending_evaluation) = state.current_evaluation() { + state.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationPending { time: meta.time(), epoch_number: *epoch_number, epoch_data: pending_evaluation.epoch_data, latest_evaluated_global_slot: *latest_evaluated_global_slot, + }; + } + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + if let Some(vrf_evaluator_state) = state.block_producer.vrf_evaluator() { + if let Some(vrf_input) = vrf_evaluator_state.construct_vrf_input() { + dispatcher + .push(BlockProducerVrfEvaluatorAction::EvaluateSlot { vrf_input }); } } } @@ -202,41 +404,56 @@ impl BlockProducerVrfEvaluatorState { epoch_number, latest_evaluated_global_slot: _, } => { - self.unset_pending_evaluation(); - self.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationSuccess { + state.unset_pending_evaluation(); + state.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationSuccess { time: meta.time(), epoch_number: *epoch_number, }; - self.set_last_evaluated_epoch(); + state.set_last_evaluated_epoch(); } BlockProducerVrfEvaluatorAction::WaitForNextEvaluation => { - self.status = + state.status = BlockProducerVrfEvaluatorStatus::WaitingForNextEvaluation { time: meta.time() }; } BlockProducerVrfEvaluatorAction::SelectInitialSlot { best_tip_epoch, current_global_slot, next_epoch_first_slot, - best_tip_slot: _, - best_tip_global_slot: _, - staking_epoch_data: _, + best_tip_slot: current_best_tip_slot, + best_tip_global_slot: current_best_tip_global_slot, + staking_epoch_data, } => { - let (epoch_number, initial_slot) = match self.epoch_context() { + let (epoch_number, initial_slot) = match state.epoch_context() { super::EpochContext::Current(_) => (*best_tip_epoch, *current_global_slot), super::EpochContext::Next(_) => (best_tip_epoch + 1, next_epoch_first_slot - 1), super::EpochContext::Waiting => todo!(), }; - self.status = BlockProducerVrfEvaluatorStatus::InitialSlotSelection { + state.status = BlockProducerVrfEvaluatorStatus::InitialSlotSelection { time: meta.time(), epoch_number, initial_slot, + }; + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + if let Some(initial_slot) = state + .block_producer + .vrf_evaluator() + .and_then(|v| v.initial_slot()) + { + dispatcher.push(BlockProducerVrfEvaluatorAction::BeginEpochEvaluation { + best_tip_epoch: *best_tip_epoch, + best_tip_global_slot: *current_best_tip_global_slot, + best_tip_slot: *current_best_tip_slot, + staking_epoch_data: staking_epoch_data.clone(), + latest_evaluated_global_slot: initial_slot, + }); } } BlockProducerVrfEvaluatorAction::CleanupOldSlots { best_tip_epoch } => { - self.cleanup_old_won_slots(best_tip_epoch); + state.cleanup_old_won_slots(best_tip_epoch); } BlockProducerVrfEvaluatorAction::InterruptEpochEvaluation { reason } => { - self.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationInterrupted { + state.status = BlockProducerVrfEvaluatorStatus::EpochEvaluationInterrupted { time: meta.time(), reason: reason.clone(), }; diff --git a/node/src/block_producer/vrf_evaluator/mod.rs b/node/src/block_producer/vrf_evaluator/mod.rs index 1c8f624618..0cfe2e0014 100644 --- a/node/src/block_producer/vrf_evaluator/mod.rs +++ b/node/src/block_producer/vrf_evaluator/mod.rs @@ -9,11 +9,6 @@ pub use block_producer_vrf_evaluator_actions::*; mod block_producer_vrf_evaluator_reducer; -mod block_producer_vrf_evaluator_effects; - -mod block_producer_vrf_evaluator_service; -pub use block_producer_vrf_evaluator_service::*; - use std::collections::BTreeMap; use std::sync::Arc; diff --git a/node/src/block_producer_effectful/block_producer_effectful_actions.rs b/node/src/block_producer_effectful/block_producer_effectful_actions.rs new file mode 100644 index 0000000000..a81b4702b9 --- /dev/null +++ b/node/src/block_producer_effectful/block_producer_effectful_actions.rs @@ -0,0 +1,26 @@ +use super::vrf_evaluator_effectful::BlockProducerVrfEvaluatorEffectfulAction; +use crate::block_producer::{BlockProducerWonSlot, BlockProducerWonSlotDiscardReason}; +use openmina_core::ActionEvent; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +pub enum BlockProducerEffectfulAction { + VrfEvaluator(BlockProducerVrfEvaluatorEffectfulAction), + WonSlot { + won_slot: BlockProducerWonSlot, + }, + WonSlotDiscard { + reason: BlockProducerWonSlotDiscardReason, + }, + StagedLedgerDiffCreateInit, + StagedLedgerDiffCreateSuccess, + BlockUnprovenBuild, + BlockProveInit, + BlockProveSuccess, +} + +impl redux::EnablingCondition for BlockProducerEffectfulAction { + fn is_enabled(&self, _state: &crate::State, _time: redux::Timestamp) -> bool { + true + } +} diff --git a/node/src/block_producer/block_producer_effects.rs b/node/src/block_producer_effectful/block_producer_effectful_effects.rs similarity index 52% rename from node/src/block_producer/block_producer_effects.rs rename to node/src/block_producer_effectful/block_producer_effectful_effects.rs index 66bca390a4..798ddaf009 100644 --- a/node/src/block_producer/block_producer_effects.rs +++ b/node/src/block_producer_effectful/block_producer_effectful_effects.rs @@ -1,122 +1,28 @@ +use crate::{ + block_producer::BlockProducerCurrentState, + ledger::write::{LedgerWriteAction, LedgerWriteRequest}, + BlockProducerAction, Store, +}; use mina_p2p_messages::v2::{ BlockchainSnarkBlockchainStableV2, ConsensusStakeProofStableV2, MinaStateSnarkTransitionValueStableV2, ProverExtendBlockchainInputStableV2, }; -use openmina_core::bug_condition; -use openmina_core::consensus::in_seed_update_range; - -use crate::account::AccountSecretKey; -use crate::ledger::write::{LedgerWriteAction, LedgerWriteRequest}; -use crate::transition_frontier::sync::TransitionFrontierSyncAction; -use crate::{Store, TransactionPoolAction}; +use openmina_node_account::AccountSecretKey; +use redux::ActionWithMeta; -use super::vrf_evaluator::{BlockProducerVrfEvaluatorAction, InterruptReason}; -use super::{ - next_epoch_first_slot, to_epoch_and_slot, BlockProducerAction, BlockProducerActionWithMeta, - BlockProducerCurrentState, -}; +use super::BlockProducerEffectfulAction; pub fn block_producer_effects( store: &mut Store, - action: BlockProducerActionWithMeta, + action: ActionWithMeta, ) { let (action, meta) = action.split(); match action { - BlockProducerAction::VrfEvaluator(a) => { - // TODO: does the order matter? can this clone be avoided? - let has_won_slot = match &a { - BlockProducerVrfEvaluatorAction::ProcessSlotEvaluationSuccess { - vrf_output, - .. - } => { - matches!(vrf_output, vrf::VrfEvaluationOutput::SlotWon(_)) - } - _ => false, - }; + BlockProducerEffectfulAction::VrfEvaluator(a) => { a.effects(&meta, store); - if has_won_slot { - store.dispatch(BlockProducerAction::WonSlotSearch); - } } - BlockProducerAction::BestTipUpdate { best_tip } => { - let global_slot = best_tip - .consensus_state() - .curr_global_slot_since_hard_fork - .clone(); - - let (best_tip_epoch, best_tip_slot) = to_epoch_and_slot(&global_slot); - let root_block_epoch = if let Some(root_block) = - store.state().transition_frontier.root() - { - let root_block_global_slot = root_block.curr_global_slot_since_hard_fork(); - to_epoch_and_slot(root_block_global_slot).0 - } else { - bug_condition!("Expected to find a block at the root of the transition frontier but there was none"); - best_tip_epoch.saturating_sub(1) - }; - let next_epoch_first_slot = next_epoch_first_slot(&global_slot); - let current_epoch = store.state().current_epoch(); - let current_slot = store.state().current_slot(); - - store.dispatch(BlockProducerVrfEvaluatorAction::InitializeEvaluator { - best_tip: best_tip.clone(), - }); - - // None if the evaluator is not evaluating - let currenty_evaluated_epoch = store - .state() - .block_producer - .vrf_evaluator() - .and_then(|vrf_evaluator| vrf_evaluator.currently_evaluated_epoch()); - - if let Some(currently_evaluated_epoch) = currenty_evaluated_epoch { - // if we receive a block with higher epoch than the current one, interrupt the evaluation - if currently_evaluated_epoch < best_tip_epoch { - store.dispatch(BlockProducerVrfEvaluatorAction::InterruptEpochEvaluation { - reason: InterruptReason::BestTipWithHigherEpoch, - }); - } - } - - let is_next_epoch_seed_finalized = if let Some(current_slot) = current_slot { - !in_seed_update_range(current_slot, best_tip.constants()) - } else { - false - }; - - store.dispatch(BlockProducerVrfEvaluatorAction::CheckEpochEvaluability { - current_epoch, - is_next_epoch_seed_finalized, - root_block_epoch, - best_tip_epoch, - best_tip_slot, - best_tip_global_slot: best_tip.global_slot(), - next_epoch_first_slot, - staking_epoch_data: Box::new(best_tip.consensus_state().staking_epoch_data.clone()), - next_epoch_data: Box::new(best_tip.consensus_state().next_epoch_data.clone()), - }); - - if let Some(reason) = store - .state() - .block_producer - .with(None, |bp| bp.current.won_slot_should_discard(&best_tip)) - { - store.dispatch(BlockProducerAction::WonSlotDiscard { reason }); - } else { - store.dispatch(BlockProducerAction::WonSlotSearch); - } - } - BlockProducerAction::WonSlotSearch => { - if let Some(won_slot) = store.state().block_producer.with(None, |bp| { - let best_tip = store.state().transition_frontier.best_tip()?; - let cur_global_slot = store.state().cur_global_slot()?; - bp.vrf_evaluator.next_won_slot(cur_global_slot, best_tip) - }) { - store.dispatch(BlockProducerAction::WonSlot { won_slot }); - } - } - BlockProducerAction::WonSlot { won_slot } => { + BlockProducerEffectfulAction::WonSlot { won_slot } => { if let Some(stats) = store.service.stats() { stats.block_producer().scheduled(meta.time(), &won_slot); } @@ -124,17 +30,7 @@ pub fn block_producer_effects( store.dispatch(BlockProducerAction::WonSlotProduceInit); } } - BlockProducerAction::WonSlotWait => {} - BlockProducerAction::WonSlotProduceInit => { - store.dispatch(BlockProducerAction::WonSlotTransactionsGet); - } - BlockProducerAction::WonSlotTransactionsGet => { - store.dispatch(TransactionPoolAction::CollectTransactionsByFee); - } - BlockProducerAction::WonSlotTransactionsSuccess { .. } => { - store.dispatch(BlockProducerAction::StagedLedgerDiffCreateInit); - } - BlockProducerAction::StagedLedgerDiffCreateInit => { + BlockProducerEffectfulAction::StagedLedgerDiffCreateInit => { if let Some(stats) = store.service.stats() { stats .block_producer() @@ -195,8 +91,7 @@ pub fn block_producer_effects( ), }); } - BlockProducerAction::StagedLedgerDiffCreatePending => {} - BlockProducerAction::StagedLedgerDiffCreateSuccess { .. } => { + BlockProducerEffectfulAction::StagedLedgerDiffCreateSuccess => { if let Some(stats) = store.service.stats() { stats .block_producer() @@ -204,7 +99,7 @@ pub fn block_producer_effects( } store.dispatch(BlockProducerAction::BlockUnprovenBuild); } - BlockProducerAction::BlockUnprovenBuild => { + BlockProducerEffectfulAction::BlockUnprovenBuild => { if let Some(stats) = store.service.stats() { let bp = &store.state.get().block_producer; if let Some((block_hash, block)) = bp.with(None, |bp| match &bp.current { @@ -221,7 +116,7 @@ pub fn block_producer_effects( store.dispatch(BlockProducerAction::BlockProveInit); } - BlockProducerAction::BlockProveInit => { + BlockProducerEffectfulAction::BlockProveInit => { let service = &mut store.service; if let Some(stats) = service.stats() { @@ -293,46 +188,13 @@ pub fn block_producer_effects( service.prove(block_hash, input); store.dispatch(BlockProducerAction::BlockProvePending); } - BlockProducerAction::BlockProvePending => {} - BlockProducerAction::BlockProveSuccess { .. } => { + BlockProducerEffectfulAction::BlockProveSuccess => { if let Some(stats) = store.service.stats() { stats.block_producer().proof_create_end(meta.time()); } store.dispatch(BlockProducerAction::BlockProduced); } - BlockProducerAction::BlockProduced => { - store.dispatch(BlockProducerAction::BlockInject); - } - BlockProducerAction::BlockInject => { - let Some((best_tip, root_block, blocks_inbetween)) = None.or_else(|| { - let (best_tip, chain) = store.state().block_producer.produced_block_with_chain()?; - let mut iter = chain.iter(); - let root_block = iter.next()?.block_with_hash(); - let blocks_inbetween = iter.map(|b| b.hash().clone()).collect(); - Some((best_tip.clone(), root_block.clone(), blocks_inbetween)) - }) else { - return; - }; - - let previous_root_snarked_ledger_hash = store - .state() - .transition_frontier - .root() - .map(|b| b.snarked_ledger_hash().clone()); - - if store.dispatch(TransitionFrontierSyncAction::BestTipUpdate { - previous_root_snarked_ledger_hash, - best_tip: best_tip.clone(), - root_block, - blocks_inbetween, - }) { - store.dispatch(BlockProducerAction::BlockInjected); - } - } - BlockProducerAction::BlockInjected => { - store.dispatch(BlockProducerAction::WonSlotSearch); - } - BlockProducerAction::WonSlotDiscard { reason } => { + BlockProducerEffectfulAction::WonSlotDiscard { reason } => { if let Some(stats) = store.service.stats() { stats.block_producer().discarded(meta.time(), reason); } diff --git a/node/src/block_producer/block_producer_service.rs b/node/src/block_producer_effectful/block_producer_effectful_service.rs similarity index 100% rename from node/src/block_producer/block_producer_service.rs rename to node/src/block_producer_effectful/block_producer_effectful_service.rs diff --git a/node/src/block_producer_effectful/mod.rs b/node/src/block_producer_effectful/mod.rs new file mode 100644 index 0000000000..40ce48fda6 --- /dev/null +++ b/node/src/block_producer_effectful/mod.rs @@ -0,0 +1,10 @@ +pub mod vrf_evaluator_effectful; + +mod block_producer_effectful_actions; +pub use block_producer_effectful_actions::*; + +mod block_producer_effectful_effects; +pub use block_producer_effectful_effects::*; + +mod block_producer_effectful_service; +pub use block_producer_effectful_service::*; diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs new file mode 100644 index 0000000000..01fcf6f521 --- /dev/null +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs @@ -0,0 +1,20 @@ +use crate::block_producer::vrf_evaluator::VrfEvaluatorInput; +use openmina_core::ActionEvent; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +pub enum BlockProducerVrfEvaluatorEffectfulAction { + EvaluateSlot { vrf_input: VrfEvaluatorInput }, +} + +impl redux::EnablingCondition for BlockProducerVrfEvaluatorEffectfulAction { + fn is_enabled(&self, _state: &crate::State, _time: redux::Timestamp) -> bool { + true + } +} + +impl From for crate::Action { + fn from(value: BlockProducerVrfEvaluatorEffectfulAction) -> Self { + Self::BlockProducerEffectful(crate::BlockProducerEffectfulAction::VrfEvaluator(value)) + } +} diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs new file mode 100644 index 0000000000..1a0d6bf41c --- /dev/null +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs @@ -0,0 +1,15 @@ +use crate::Service; +use crate::Store; +use redux::ActionMeta; + +use super::BlockProducerVrfEvaluatorEffectfulAction; + +impl BlockProducerVrfEvaluatorEffectfulAction { + pub fn effects(self, _: &ActionMeta, store: &mut Store) { + match self { + BlockProducerVrfEvaluatorEffectfulAction::EvaluateSlot { vrf_input } => { + store.service.evaluate(vrf_input); + } + } + } +} diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_service.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_service.rs similarity index 65% rename from node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_service.rs rename to node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_service.rs index 84b3a0564d..f66525d360 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_service.rs +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_service.rs @@ -1,4 +1,4 @@ -use super::VrfEvaluatorInput; +use crate::block_producer::vrf_evaluator::VrfEvaluatorInput; pub trait BlockProducerVrfEvaluatorService: redux::Service { fn evaluate(&mut self, data: VrfEvaluatorInput); diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/mod.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/mod.rs new file mode 100644 index 0000000000..c55fbe7da8 --- /dev/null +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/mod.rs @@ -0,0 +1,7 @@ +mod block_producer_vrf_evaluator_effectful_actions; +pub use block_producer_vrf_evaluator_effectful_actions::*; + +mod block_producer_vrf_evaluator_effectful_effects; + +mod block_producer_vrf_evaluator_effectful_service; +pub use block_producer_vrf_evaluator_effectful_service::*; diff --git a/node/src/consensus/consensus_reducer.rs b/node/src/consensus/consensus_reducer.rs index 19fd383106..2db1931633 100644 --- a/node/src/consensus/consensus_reducer.rs +++ b/node/src/consensus/consensus_reducer.rs @@ -268,6 +268,7 @@ impl ConsensusState { best_tip, root_block, blocks_inbetween, + on_success: None, }); } ConsensusAction::P2pBestTipUpdate { best_tip } => { diff --git a/node/src/effects.rs b/node/src/effects.rs index b94fca3399..88c051216a 100644 --- a/node/src/effects.rs +++ b/node/src/effects.rs @@ -1,7 +1,8 @@ use openmina_core::log::system_time; use rand::prelude::*; -use crate::block_producer::{block_producer_effects, BlockProducerAction}; +use crate::block_producer::BlockProducerAction; +use crate::block_producer_effectful::block_producer_effects; use crate::event_source::event_source_effects; use crate::external_snark_worker::external_snark_worker_effects; use crate::ledger::ledger_effects; @@ -81,7 +82,8 @@ pub fn effects(store: &mut Store, action: ActionWithMeta) { Action::SnarkPoolEffect(action) => { snark_pool_effects(store, meta.with_action(action)); } - Action::BlockProducer(action) => { + Action::BlockProducer(_) => {} + Action::BlockProducerEffectful(action) => { block_producer_effects(store, meta.with_action(action)); } Action::ExternalSnarkWorker(action) => { diff --git a/node/src/ledger/ledger_service.rs b/node/src/ledger/ledger_service.rs index 301ec0788c..7e9846e4fb 100644 --- a/node/src/ledger/ledger_service.rs +++ b/node/src/ledger/ledger_service.rs @@ -49,7 +49,7 @@ use openmina_core::{block::AppliedBlock, constants::constraint_constants}; use mina_signer::CompressedPubKey; use openmina_core::block::ArcBlockWithHash; -use crate::block_producer::StagedLedgerDiffCreateOutput; +use crate::block_producer_effectful::StagedLedgerDiffCreateOutput; use crate::p2p::channels::rpc::StagedLedgerAuxAndPendingCoinbases; use crate::rpc::{ RpcScanStateSummaryBlockTransaction, RpcScanStateSummaryScanStateJob, diff --git a/node/src/ledger/write/mod.rs b/node/src/ledger/write/mod.rs index 88a8646a65..64f8c3ea81 100644 --- a/node/src/ledger/write/mod.rs +++ b/node/src/ledger/write/mod.rs @@ -16,7 +16,7 @@ use ledger::scan_state::scan_state::AvailableJobMessage; use mina_p2p_messages::v2; use serde::{Deserialize, Serialize}; -use crate::block_producer::StagedLedgerDiffCreateOutput; +use crate::block_producer_effectful::StagedLedgerDiffCreateOutput; use crate::core::block::ArcBlockWithHash; use crate::core::snark::{Snark, SnarkJobId}; use crate::transition_frontier::sync::ledger::staged::StagedLedgerAuxAndPendingCoinbasesValid; diff --git a/node/src/lib.rs b/node/src/lib.rs index 7e18daf5e8..76f23d7dbb 100644 --- a/node/src/lib.rs +++ b/node/src/lib.rs @@ -30,6 +30,7 @@ pub mod recorder; pub mod stats; pub mod block_producer; +pub mod block_producer_effectful; pub mod consensus; pub mod daemon_json; pub mod event_source; diff --git a/node/src/reducer.rs b/node/src/reducer.rs index 4809b93858..9b5a08befe 100644 --- a/node/src/reducer.rs +++ b/node/src/reducer.rs @@ -2,7 +2,8 @@ use openmina_core::{bug_condition, error, Substate}; use p2p::{P2pAction, P2pEffectfulAction, P2pInitializeAction, P2pState}; use crate::{ - rpc::RpcState, Action, ActionWithMeta, ConsensusAction, EventSourceAction, P2p, State, + rpc::RpcState, state::BlockProducerState, Action, ActionWithMeta, ConsensusAction, + EventSourceAction, P2p, State, }; pub fn reducer( @@ -81,11 +82,10 @@ pub fn reducer( ); } Action::TransactionPoolEffect(_) => {} - Action::BlockProducer(a) => { - state - .block_producer - .reducer(meta.with_action(a), &state.transition_frontier.best_chain); + Action::BlockProducer(action) => { + BlockProducerState::reducer(Substate::new(state, dispatcher), meta.with_action(action)); } + Action::BlockProducerEffectful(_) => {} Action::ExternalSnarkWorker(a) => { state.external_snark_worker.reducer(meta.with_action(a)); } diff --git a/node/src/service.rs b/node/src/service.rs index f29474cf1f..c656a6e579 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -1,5 +1,5 @@ -pub use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorService; -pub use crate::block_producer::BlockProducerService; +pub use crate::block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorService; +pub use crate::block_producer_effectful::BlockProducerService; pub use crate::event_source::EventSourceService; pub use crate::external_snark_worker::ExternalSnarkWorkerService; pub use crate::ledger::LedgerService; diff --git a/node/src/state.rs b/node/src/state.rs index 76de2ce522..f62f3abdd3 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -24,6 +24,7 @@ use snark::block_verify::SnarkBlockVerifyState; use snark::user_command_verify::SnarkUserCommandVerifyState; use snark::work_verify::SnarkWorkVerifyState; +use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorState; pub use crate::block_producer::BlockProducerState; pub use crate::consensus::ConsensusState; use crate::external_snark_worker::ExternalSnarkWorkers; @@ -128,6 +129,24 @@ impl openmina_core::SubstateAccess for State } } +impl SubstateAccess for State { + fn substate(&self) -> openmina_core::SubstateResult<&BlockProducerVrfEvaluatorState> { + self.block_producer + .as_ref() + .map(|state| &state.vrf_evaluator) + .ok_or_else(|| "Block producer VRF evaluator state unavailable".to_owned()) + } + + fn substate_mut( + &mut self, + ) -> openmina_core::SubstateResult<&mut BlockProducerVrfEvaluatorState> { + self.block_producer + .as_mut() + .map(|state| &mut state.vrf_evaluator) + .ok_or_else(|| "Block producer VRF evaluator state unavailable".to_owned()) + } +} + impl openmina_core::SubstateAccess for State { fn substate(&self) -> openmina_core::SubstateResult<&TransitionFrontierSyncLedgerSnarkedState> { self.transition_frontier diff --git a/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs b/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs index 7ac2b1416c..c2c37d4857 100644 --- a/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs +++ b/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs @@ -2,6 +2,7 @@ use mina_p2p_messages::v2::{LedgerHash, StateHash}; use openmina_core::block::ArcBlockWithHash; use openmina_core::consensus::consensus_take; use openmina_core::ActionEvent; +use redux::Callback; use serde::{Deserialize, Serialize}; use crate::ledger::write::CommitResult; @@ -45,6 +46,7 @@ pub enum TransitionFrontierSyncAction { best_tip: ArcBlockWithHash, root_block: ArcBlockWithHash, blocks_inbetween: Vec, + on_success: Option>, }, /// Staking Ledger sync is pending #[action_event(level = info)] diff --git a/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs b/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs index 496c71c936..e121f1ab44 100644 --- a/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs +++ b/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs @@ -49,6 +49,7 @@ impl TransitionFrontierSyncAction { TransitionFrontierSyncAction::BestTipUpdate { previous_root_snarked_ledger_hash, best_tip, + on_success, .. } => { // TODO(tizoc): this is currently required because how how complicated the BestTipUpdate reducer is, @@ -72,6 +73,9 @@ impl TransitionFrontierSyncAction { store.dispatch(TransitionFrontierSyncAction::BlocksNextApplyInit); // TODO(binier): cleanup ledgers + if let Some(callback) = on_success { + store.dispatch_callback(callback.clone(), ()); + } } // TODO(tizoc): this action is never called with the current implementation, // either remove it or figure out how to recover it as a reaction to diff --git a/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs b/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs index e1809a8c19..029a2b7667 100644 --- a/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs +++ b/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs @@ -44,6 +44,7 @@ impl TransitionFrontierSyncState { best_tip, root_block, blocks_inbetween, + .. } => match state { Self::StakingLedgerPending(substate) | Self::NextEpochLedgerPending(substate) From 22b7aaac278058d7b6bda72f8b3ad9b8ce272ce1 Mon Sep 17 00:00:00 2001 From: Mimir Date: Thu, 31 Oct 2024 12:39:25 +0100 Subject: [PATCH 002/175] Review fixes --- .../block_producer/block_producer_reducer.rs | 65 ++++++++----------- .../block_producer_vrf_evaluator_reducer.rs | 18 ++--- .../p2p_connection_incoming_reducer.rs | 3 +- .../p2p_connection_outgoing_reducer.rs | 8 ++- 4 files changed, 43 insertions(+), 51 deletions(-) diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index 2451bf6507..fe178cd5fb 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -43,6 +43,7 @@ impl BlockProducerState { } impl BlockProducerEnabled { + /// Substate is accesses from global state, because applied blocks from transition frontier are required pub fn reducer(mut state_context: Substate, action: BlockProducerActionWithMetaRef<'_>) { let (action, meta) = action.split(); let Ok(global_state) = state_context.get_substate_mut() else { @@ -88,11 +89,10 @@ impl BlockProducerEnabled { won_slot: won_slot.clone(), }; - state_context - .into_dispatcher() - .push(BlockProducerEffectfulAction::WonSlot { - won_slot: won_slot.clone(), - }); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerEffectfulAction::WonSlot { + won_slot: won_slot.clone(), + }); } BlockProducerAction::WonSlotDiscard { reason } => { if let Some(won_slot) = state.current.won_slot() { @@ -103,9 +103,8 @@ impl BlockProducerEnabled { }; } - state_context - .into_dispatcher() - .push(BlockProducerEffectfulAction::WonSlotDiscard { reason: *reason }); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerEffectfulAction::WonSlotDiscard { reason: *reason }); } BlockProducerAction::WonSlotWait => { if let Some(won_slot) = state.current.won_slot() { @@ -129,9 +128,8 @@ impl BlockProducerEnabled { chain: chain.clone(), }; - state_context - .into_dispatcher() - .push(TransactionPoolAction::CollectTransactionsByFee); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(TransactionPoolAction::CollectTransactionsByFee); } BlockProducerAction::WonSlotTransactionsSuccess { transactions_by_fee, @@ -150,9 +148,8 @@ impl BlockProducerEnabled { transactions_by_fee: transactions_by_fee.clone(), }; - state_context - .into_dispatcher() - .push(BlockProducerAction::StagedLedgerDiffCreateInit); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerAction::StagedLedgerDiffCreateInit); } BlockProducerAction::WonSlotProduceInit => { if let Some(won_slot) = state.current.won_slot() { @@ -173,14 +170,12 @@ impl BlockProducerEnabled { }; } - state_context - .into_dispatcher() - .push(BlockProducerAction::WonSlotTransactionsGet); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerAction::WonSlotTransactionsGet); } BlockProducerAction::StagedLedgerDiffCreateInit => { - state_context - .into_dispatcher() - .push(BlockProducerEffectfulAction::StagedLedgerDiffCreateInit); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerEffectfulAction::StagedLedgerDiffCreateInit); } BlockProducerAction::StagedLedgerDiffCreatePending => { let BlockProducerCurrentState::WonSlotTransactionsSuccess { @@ -221,21 +216,18 @@ impl BlockProducerEnabled { stake_proof_sparse_ledger: output.stake_proof_sparse_ledger.clone(), }; - state_context - .into_dispatcher() - .push(BlockProducerEffectfulAction::StagedLedgerDiffCreateSuccess); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerEffectfulAction::StagedLedgerDiffCreateSuccess); } BlockProducerAction::BlockUnprovenBuild => { state.reduce_block_unproved_build(meta.time()); - state_context - .into_dispatcher() - .push(BlockProducerEffectfulAction::BlockUnprovenBuild); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerEffectfulAction::BlockUnprovenBuild); } BlockProducerAction::BlockProveInit => { - state_context - .into_dispatcher() - .push(BlockProducerEffectfulAction::BlockProveInit); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerEffectfulAction::BlockProveInit); } BlockProducerAction::BlockProvePending => { if let BlockProducerCurrentState::BlockUnprovenBuilt { @@ -282,9 +274,8 @@ impl BlockProducerEnabled { }; } - state_context - .into_dispatcher() - .push(BlockProducerEffectfulAction::BlockProveSuccess); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerEffectfulAction::BlockProveSuccess); } BlockProducerAction::BlockProduced => { if let BlockProducerCurrentState::BlockProveSuccess { @@ -304,9 +295,8 @@ impl BlockProducerEnabled { }; } - state_context - .into_dispatcher() - .push(BlockProducerAction::BlockInject); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerAction::BlockInject); } BlockProducerAction::BlockInject => { let (dispatcher, state) = state_context.into_dispatcher_and_state(); @@ -355,9 +345,8 @@ impl BlockProducerEnabled { }; } - state_context - .into_dispatcher() - .push(BlockProducerAction::WonSlotSearch); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerAction::WonSlotSearch); } } } diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs index 420c2c8925..93e789260a 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs @@ -1,3 +1,4 @@ +use openmina_core::bug_condition; use vrf::VrfEvaluationOutput; use crate::{ @@ -30,11 +31,10 @@ impl BlockProducerVrfEvaluatorState { global_slot: vrf_input.global_slot, }; - state_context.into_dispatcher().push( - BlockProducerVrfEvaluatorEffectfulAction::EvaluateSlot { - vrf_input: vrf_input.clone(), - }, - ); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerVrfEvaluatorEffectfulAction::EvaluateSlot { + vrf_input: vrf_input.clone(), + }); } BlockProducerVrfEvaluatorAction::ProcessSlotEvaluationSuccess { vrf_output, @@ -243,9 +243,8 @@ impl BlockProducerVrfEvaluatorState { producer: producer.clone(), }; - state_context - .into_dispatcher() - .push(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); } BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction => { let BlockProducerVrfEvaluatorStatus::ReadyToEvaluate { @@ -299,6 +298,7 @@ impl BlockProducerVrfEvaluatorState { staking_epoch_ledger_hash: _, } = &state.status else { + bug_condition!("Invalid state for `BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction` expected: `BlockProducerVrfEvaluatorStatus::EpochDelegatorTablePending`, found: {:?}", state.status); return; }; @@ -336,7 +336,7 @@ impl BlockProducerVrfEvaluatorState { }, )) = get_slot_and_status() else { - // error here! + bug_condition!("Invalid state for `BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction`"); return; }; diff --git a/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs b/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs index a47c5c14a6..0b227ee79e 100644 --- a/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs +++ b/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs @@ -252,7 +252,8 @@ impl P2pConnectionIncomingState { rpc_id: rpc_id.take(), }; - state_context.into_dispatcher().push(P2pConnectionIncomingEffectfulAction::ConnectionAuthorizationEncryptAndSend { peer_id, other_pub_key, auth }); + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(P2pConnectionIncomingEffectfulAction::ConnectionAuthorizationEncryptAndSend { peer_id, other_pub_key, auth }); } else { bug_condition!( "Invalid state for `P2pConnectionIncomingAction::FinalizePending`: {:?}", diff --git a/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs b/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs index 4994b9bd49..de0acbd268 100644 --- a/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs +++ b/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs @@ -315,8 +315,9 @@ impl P2pConnectionOutgoingState { state ); } - state_context - .into_dispatcher() + + let dispatcher = state_context.into_dispatcher(); + dispatcher .push(P2pConnectionOutgoingEffectfulAction::AnswerSet { peer_id, answer }); Ok(()) } @@ -362,7 +363,8 @@ impl P2pConnectionOutgoingState { } }; - state_context.into_dispatcher().push( + let dispatcher = state_context.into_dispatcher(); + dispatcher.push( P2pConnectionOutgoingEffectfulAction::ConnectionAuthorizationEncryptAndSend { peer_id, other_pub_key, From d2323ab71f64de9f2f4589cdf5428d6a427f8996 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Fri, 1 Nov 2024 12:20:47 +0400 Subject: [PATCH 003/175] fix(redux/time): handle system suspension --- Cargo.lock | 2 +- Cargo.toml | 2 +- node/testing/src/cluster/runner/mod.rs | 2 +- .../scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs | 2 +- node/testing/src/scenarios/solo_node/bootstrap.rs | 2 +- p2p/testing/src/service.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7350cf9a1f..9bbde61f6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5686,7 +5686,7 @@ dependencies = [ [[package]] name = "redux" version = "0.1.0" -source = "git+https://github.com/openmina/redux-rs.git?rev=bf0726e5#bf0726e596a456f2204c5138528ac7a64695e3b4" +source = "git+https://github.com/openmina/redux-rs.git?rev=741a01d#741a01df74b84715391651438c1b1ff60d117901" dependencies = [ "enum_dispatch", "linkme", diff --git a/Cargo.toml b/Cargo.toml index 763bd8b627..17198539e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ poly-commitment = {git = "https://github.com/openmina/proof-systems", rev = "2fd libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false } vrf = { path = "vrf" } openmina-node-account = { path = "node/account" } -redux = { git = "https://github.com/openmina/redux-rs.git", rev = "bf0726e5", features = ["serde"] } +redux = { git = "https://github.com/openmina/redux-rs.git", rev = "741a01d", features = ["serde"] } serde = "1.0.190" serde_json = "1.0.107" serde_with = { version = "3.7.0", features = ["hex"] } diff --git a/node/testing/src/cluster/runner/mod.rs b/node/testing/src/cluster/runner/mod.rs index afc240d32d..163fe717e1 100644 --- a/node/testing/src/cluster/runner/mod.rs +++ b/node/testing/src/cluster/runner/mod.rs @@ -319,7 +319,7 @@ impl<'a> ClusterRunner<'a> { where F: Fn(&State, u32, u32) -> bool, { - let now = tokio::time::Instant::now(); + let now = redux::Instant::now(); let mut last_slot: u32 = 0; let mut produced_blocks: u32 = 0; diff --git a/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs b/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs index e37b82be3c..d3d3a10be3 100644 --- a/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs +++ b/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs @@ -32,7 +32,7 @@ pub struct MultiNodeVrfEpochBoundsCorrectLedger; impl MultiNodeVrfEpochBoundsCorrectLedger { pub async fn run(self, mut runner: ClusterRunner<'_>) { - let start = tokio::time::Instant::now(); + let start = redux::Instant::now(); let initial_time = runner.get_initial_time().unwrap(); let (initial_node, _) = runner.nodes_iter().last().unwrap(); diff --git a/node/testing/src/scenarios/solo_node/bootstrap.rs b/node/testing/src/scenarios/solo_node/bootstrap.rs index 858decf4b3..5293592b93 100644 --- a/node/testing/src/scenarios/solo_node/bootstrap.rs +++ b/node/testing/src/scenarios/solo_node/bootstrap.rs @@ -1,7 +1,7 @@ use std::time::Duration; use node::transition_frontier::sync::TransitionFrontierSyncState; -use tokio::time::Instant; +use redux::Instant; use crate::{ hosts, diff --git a/p2p/testing/src/service.rs b/p2p/testing/src/service.rs index 58681a347e..1a25065c54 100644 --- a/p2p/testing/src/service.rs +++ b/p2p/testing/src/service.rs @@ -64,7 +64,7 @@ impl ClusterService { impl TimeService for ClusterService { fn monotonic_time(&mut self) -> redux::Instant { - self.time + self.time.into() } } From f63efa5caebabef81a7d714a2f5fdde47d796798 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:46:09 +0200 Subject: [PATCH 004/175] Frontend - Web node loading page v1 (#858) Frontend - Web node loading page v1 (#858) --- frontend/src/app/app.component.html | 4 +- frontend/src/app/app.component.ts | 15 ++- frontend/src/app/app.module.ts | 2 +- frontend/src/app/app.routing.ts | 8 +- .../src/app/core/services/web-node.service.ts | 6 +- .../web-node-demo-dashboard.component.html | 55 +++++++++++ .../web-node-demo-dashboard.component.scss | 60 +++++++++++ .../web-node-demo-dashboard.component.ts | 99 +++++++++++++++++++ .../features/webnode/webnode.component.html | 1 + .../features/webnode/webnode.component.scss | 0 .../app/features/webnode/webnode.component.ts | 18 ++++ .../app/features/webnode/webnode.module.ts | 14 +++ .../app/features/webnode/webnode.routing.ts | 16 +++ .../web-node-landing-page.component.scss | 2 +- frontend/src/app/shared/enums/routes.enum.ts | 1 + frontend/src/environments/environment.ts | 32 +++--- 16 files changed, 310 insertions(+), 23 deletions(-) create mode 100644 frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html create mode 100644 frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss create mode 100644 frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts create mode 100644 frontend/src/app/features/webnode/webnode.component.html create mode 100644 frontend/src/app/features/webnode/webnode.component.scss create mode 100644 frontend/src/app/features/webnode/webnode.component.ts create mode 100644 frontend/src/app/features/webnode/webnode.module.ts create mode 100644 frontend/src/app/features/webnode/webnode.routing.ts diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index fdd63676c1..06b79b0c3d 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -1,7 +1,9 @@ @if (showLandingPage$ | async) { -} @else { +} @else if (showLoadingWebNodePage$ | async) { + +} @else if (loaded) { diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 2d36c7a388..8d44c2f904 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -5,9 +5,10 @@ import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout'; import { AppSelectors } from '@app/app.state'; import { AppActions } from '@app/app.actions'; import { filter, map, Observable, Subscription, take, timer } from 'rxjs'; -import { CONFIG, getFirstFeature } from '@shared/constants/config'; +import { CONFIG } from '@shared/constants/config'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { Router } from '@angular/router'; +import { Routes } from '@shared/enums/routes.enum'; @Component({ selector: 'app-root', @@ -20,8 +21,10 @@ export class AppComponent extends StoreDispatcher implements OnInit { protected readonly menu$: Observable = this.select$(AppSelectors.menu); protected readonly showLandingPage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === '/')); + protected readonly showLoadingWebNodePage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === `/${Routes.LOADING_WEB_NODE}`)); subMenusLength: number = 0; hideToolbar: boolean = CONFIG.hideToolbar; + loaded: boolean; private nodeUpdateSubscription: Subscription | null = null; @@ -42,10 +45,18 @@ export class AppComponent extends StoreDispatcher implements OnInit { take(1), filter((route: MergedRoute) => route.url !== '/'), ); + this.select( + getMergedRoute, + () => { + this.loaded = true; + this.detect(); + }, + filter(Boolean), + ); } goToWebNode(): void { - this.router.navigate([getFirstFeature()]); + this.router.navigate([Routes.LOADING_WEB_NODE]); this.initAppFunctionalities(); } diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index f2dbdf9b12..e63bed102f 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -1,4 +1,4 @@ -import { APP_INITIALIZER, ErrorHandler, Injectable, LOCALE_ID, NgModule, Provider } from '@angular/core'; +import { APP_INITIALIZER, ErrorHandler, Injectable, LOCALE_ID, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { AppComponent } from './app.component'; diff --git a/frontend/src/app/app.routing.ts b/frontend/src/app/app.routing.ts index ccf6903619..0a8cf9194a 100644 --- a/frontend/src/app/app.routing.ts +++ b/frontend/src/app/app.routing.ts @@ -14,6 +14,7 @@ export const SNARKS_TITLE: string = APP_TITLE + ' - Snarks'; export const BLOCK_PRODUCTION_TITLE: string = APP_TITLE + ' - Block Production'; export const MEMPOOL_TITLE: string = APP_TITLE + ' - Mempool'; export const BENCHMARKS_TITLE: string = APP_TITLE + ' - Benchmarks'; +export const WEBNODE_TITLE: string = APP_TITLE + ' - Web Node'; function generateRoutes(): Routes { @@ -64,6 +65,11 @@ function generateRoutes(): Routes { loadChildren: () => import('./features/benchmarks/benchmarks.module').then(m => m.BenchmarksModule), title: BENCHMARKS_TITLE, }, + { + path: 'loading-web-node', + loadChildren: () => import('./features/webnode/webnode.module').then(m => m.WebnodeModule), + title: WEBNODE_TITLE, + }, ]; if (CONFIG.showWebNodeLandingPage) { routes.push({ @@ -76,7 +82,7 @@ function generateRoutes(): Routes { ...routes, { path: '**', - redirectTo: getFirstFeature(), + redirectTo: CONFIG.showWebNodeLandingPage ? '' : getFirstFeature(), pathMatch: 'full', }, ]; diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index 612b29b6eb..1394721876 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -16,6 +16,8 @@ export class WebNodeService { private webNodeStartTime: number; private sentryEvents: any = {}; + readonly webnodeProgress$: BehaviorSubject = new BehaviorSubject(''); + constructor(private http: HttpClient) { const basex = base('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'); any(window)['bs58btc'] = { @@ -45,6 +47,7 @@ export class WebNodeService { switchMap((wasm: any) => from(wasm.default('assets/webnode/pkg/openmina_node_web_bg.wasm')).pipe(map(() => wasm))), switchMap((wasm) => { sendSentryEvent('WebNode Wasm loaded. Starting WebNode'); + this.webnodeProgress$.next('Loaded'); return from(wasm.run(this.webNodeKeyPair.privateKey)); }), tap((webnode: any) => { @@ -52,6 +55,7 @@ export class WebNodeService { this.webNodeStartTime = Date.now(); (window as any)['webnode'] = webnode; this.webnode$.next(webnode); + this.webnodeProgress$.next('Started'); }), catchError((error) => { sendSentryEvent('WebNode failed to start'); @@ -83,7 +87,6 @@ export class WebNodeService { switchMap(handle => from(any(handle).state().peers())), tap((peers) => { if (!this.sentryEvents.sentNoPeersEvent && Date.now() - this.webNodeStartTime >= 5000 && peers.length === 0) { - console.log('WebNode has no peers after 5 seconds from startup.'); sendSentryEvent('WebNode has no peers after 5 seconds from startup.'); this.sentryEvents.sentNoPeersEvent = true; } @@ -96,6 +99,7 @@ export class WebNodeService { const seconds = (Date.now() - this.webNodeStartTime) / 1000; sendSentryEvent(`WebNode connected to its first peer after ${seconds}s`); this.sentryEvents.firstPeerConnected = true; + this.webnodeProgress$.next('Connected'); } }), ); diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html new file mode 100644 index 0000000000..ae60393a22 --- /dev/null +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html @@ -0,0 +1,55 @@ +
+
+
+ With the Web Node, you can produce blocks directly through your browser +
+ +
+ @if (!loading[loading.length - 1].loaded) { + Setting up your in-browser Web Node... + } @else { + Web Node is ready + } +
+
+ +
+ @for (item of loading; track $index) { +
+
{{ item.name }}
+
+ + {{ item.loaded ? 'task_alt' : 'more_horiz' }} + +
+
+ } +
+ +
+ @if (ready) { + + } +
+ + @if (!loading[loading.length - 1].loaded && errors.length) { +
+
+
It appears there are some errors.
+
+
+ @for (error of errors; track $index) { +
{{ error }}
+ } +
+
+ } +
diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss new file mode 100644 index 0000000000..e403a607d1 --- /dev/null +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss @@ -0,0 +1,60 @@ +@import 'openmina'; + +$green: #59bfb5; +$light-peach: #0d0d0d; +$peach: #acdea0; +$sand: #5bb3fb; +$white: #000000; + +.font-16 { + font-size: 16px; +} + +.data-wrapper { + max-width: 568px; + + .header { + margin-bottom: 56px; + + .loading-webnode { + font-size: 24px; + line-height: 32px; + } + } + + .mina-icon.aware-primary { + animation: fadeIn 1500ms ease-in-out infinite; + } +} + +.launch { + height: 56px !important; + font-size: 20px; + width: 341px; + background: linear-gradient(to right, $green 0%, $sand 50%, $peach 100%); + background-size: 500%; + margin-top: 64px; + transition: background-position 1s ease; + background-position: 0 50%; + left: 50%; + transform: translateX(-50%); + + &:hover { + background-position: 100% 50%; + } +} + +@keyframes fadeIn { + 10% { + opacity: 1; + } + 38% { + opacity: 0.1; + } + 42% { + opacity: 0.1; + } + 70% { + opacity: 1; + } +} diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts new file mode 100644 index 0000000000..c181de2b15 --- /dev/null +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts @@ -0,0 +1,99 @@ +import { ChangeDetectionStrategy, Component, NgZone, OnInit } from '@angular/core'; +import { untilDestroyed } from '@ngneat/until-destroy'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { WebNodeService } from '@core/services/web-node.service'; +import { GlobalErrorHandlerService } from '@openmina/shared'; +import { NgClass, NgForOf, NgIf } from '@angular/common'; +import { Router } from '@angular/router'; +import { getFirstFeature } from '@shared/constants/config'; +import { trigger, state, style, transition, animate } from '@angular/animations'; +import { switchMap, timer } from 'rxjs'; + +export interface WebNodeDemoLoadingStep { + name: string; + loaded: boolean; + attempt?: number; + step: number; +} + + +@Component({ + selector: 'mina-web-node-demo-dashboard', + templateUrl: './web-node-demo-dashboard.component.html', + styleUrls: ['./web-node-demo-dashboard.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'flex-column h-100 w-100 align-center' }, + standalone: true, + imports: [ + NgClass, + NgIf, + NgForOf, + ], + animations: [ + trigger('fadeIn', [ + state('void', style({ opacity: 0 })), + state('*', style({ opacity: 1 })), + transition('void => *', [ + animate('.6s ease-in'), + ]), + ]), + ], +}) +export class WebNodeDemoDashboardComponent extends StoreDispatcher implements OnInit { + + readonly loading: WebNodeDemoLoadingStep[] = [ + { name: 'Setting up browser for Web Node', loaded: false, step: 1 }, + { name: 'Getting ready to produce blocks', loaded: false, step: 2 }, + { name: 'Connecting directly to Mina network', loaded: false, step: 3 }, + ]; + ready: boolean = false; + errors: string[] = []; + + constructor(private errorHandler: GlobalErrorHandlerService, + private webNodeService: WebNodeService, + private zone: NgZone, + private router: Router) { super(); } + + ngOnInit(): void { + this.listenToErrorIssuing(); + this.checkWebNodeProgress(); + this.fetchPeersInformation(); + } + + private checkWebNodeProgress(): void { + this.webNodeService.webnodeProgress$.pipe(untilDestroyed(this)).subscribe((state: string) => { + if (state === 'Loaded') { + this.loading[0].loaded = true; + } else if (state === 'Started') { + this.loading[0].loaded = true; + this.loading[1].loaded = true; + } else if (state === 'Connected') { + this.loading.forEach((step: WebNodeDemoLoadingStep) => step.loaded = true); + } + this.ready = this.loading.every((step: WebNodeDemoLoadingStep) => step.loaded); + this.detect(); + }); + } + + private fetchPeersInformation(): void { + timer(0, 1000).pipe( + switchMap(() => this.webNodeService.peers$), + untilDestroyed(this), + ).subscribe(); + } + + private listenToErrorIssuing(): void { + this.errorHandler.errors$ + .pipe(untilDestroyed(this)) + .subscribe((error: string) => { + console.log(error); + }); + } + + goToDashboard(): void { + if (!this.ready) { + return; + } + this.router.navigate([getFirstFeature()]); + } +} diff --git a/frontend/src/app/features/webnode/webnode.component.html b/frontend/src/app/features/webnode/webnode.component.html new file mode 100644 index 0000000000..98ac206ace --- /dev/null +++ b/frontend/src/app/features/webnode/webnode.component.html @@ -0,0 +1 @@ + diff --git a/frontend/src/app/features/webnode/webnode.component.scss b/frontend/src/app/features/webnode/webnode.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts new file mode 100644 index 0000000000..676e16709d --- /dev/null +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -0,0 +1,18 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { + WebNodeDemoDashboardComponent, +} from '@app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component'; + +@Component({ + selector: 'mina-webnode', + standalone: true, + imports: [ + WebNodeDemoDashboardComponent, + ], + templateUrl: './webnode.component.html', + styleUrl: './webnode.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class WebnodeComponent { + +} diff --git a/frontend/src/app/features/webnode/webnode.module.ts b/frontend/src/app/features/webnode/webnode.module.ts new file mode 100644 index 0000000000..b9f10c30ef --- /dev/null +++ b/frontend/src/app/features/webnode/webnode.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { WebnodeRouting } from './webnode.routing'; + + +@NgModule({ + declarations: [], + imports: [ + CommonModule, + WebnodeRouting, + ], +}) +export class WebnodeModule {} diff --git a/frontend/src/app/features/webnode/webnode.routing.ts b/frontend/src/app/features/webnode/webnode.routing.ts new file mode 100644 index 0000000000..fc0e9b4e9d --- /dev/null +++ b/frontend/src/app/features/webnode/webnode.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { WebnodeComponent } from '@app/features/webnode/webnode.component'; + +const routes: Routes = [ + { + path: '', + component: WebnodeComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class WebnodeRouting {} diff --git a/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.scss b/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.scss index 47a212ed2b..1862257a3c 100644 --- a/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.scss +++ b/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.scss @@ -74,7 +74,7 @@ $white: #000000; background: linear-gradient(to right, $green 0%, $sand 50%, $peach 100%); background-size: 500%; margin-bottom: 96px; - transition: background-position 2s ease; + transition: background-position 1s ease; background-position: 0 50%; &:hover { diff --git a/frontend/src/app/shared/enums/routes.enum.ts b/frontend/src/app/shared/enums/routes.enum.ts index f4a62ababd..cefbede581 100644 --- a/frontend/src/app/shared/enums/routes.enum.ts +++ b/frontend/src/app/shared/enums/routes.enum.ts @@ -37,4 +37,5 @@ export enum Routes { BLOCK_PRODUCTION = 'block-production', WON_SLOTS = 'won-slots', MEMPOOL = 'mempool', + LOADING_WEB_NODE = 'loading-web-node', } diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index 92de0479fe..c7e94f9576 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -39,22 +39,22 @@ export const environment: Readonly = { // name: 'Producer-2', // url: 'https://staging-devnet-openmina-bp-2-dashboard.minaprotocol.network', // }, - { - name: 'staging-devnet-bp-0', - url: 'https://staging-devnet-openmina-bp-0.minaprotocol.network', - }, - { - name: 'staging-devnet-bp-1', - url: 'https://staging-devnet-openmina-bp-1.minaprotocol.network', - }, - { - name: 'staging-devnet-bp-2', - url: 'https://staging-devnet-openmina-bp-2.minaprotocol.network', - }, - { - name: 'staging-devnet-bp-3', - url: 'https://staging-devnet-openmina-bp-3.minaprotocol.network', - }, + // { + // name: 'staging-devnet-bp-0', + // url: 'https://staging-devnet-openmina-bp-0.minaprotocol.network', + // }, + // { + // name: 'staging-devnet-bp-1', + // url: 'https://staging-devnet-openmina-bp-1.minaprotocol.network', + // }, + // { + // name: 'staging-devnet-bp-2', + // url: 'https://staging-devnet-openmina-bp-2.minaprotocol.network', + // }, + // { + // name: 'staging-devnet-bp-3', + // url: 'https://staging-devnet-openmina-bp-3.minaprotocol.network', + // }, { name: 'Web Node 1', isWebNode: true, From 0d34847f07b8be6edf97a2bb9332fb2f38c6ef9a Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Sat, 2 Nov 2024 10:33:33 +0100 Subject: [PATCH 005/175] Fix `grace_period_end` value when building inputs for block proof --- .../block_producer/block_producer_reducer.rs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index fe178cd5fb..9ca3c2e147 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -12,12 +12,13 @@ use mina_p2p_messages::{ StagedLedgerDiffBodyStableV1, StateBodyHash, StateHash, UnsignedExtendedUInt32StableV1, }, }; -use openmina_core::{block::ArcBlockWithHash, constants::constraint_constants}; +use openmina_core::{ + block::ArcBlockWithHash, consensus::ConsensusConstants, constants::constraint_constants, +}; use openmina_core::{ bug_condition, consensus::{ - global_sub_window, grace_period_end, in_same_checkpoint_window, in_seed_update_range, - relative_sub_window, + global_sub_window, in_same_checkpoint_window, in_seed_update_range, relative_sub_window, }, }; use redux::{callback, Dispatcher, Timestamp}; @@ -49,6 +50,7 @@ impl BlockProducerEnabled { let Ok(global_state) = state_context.get_substate_mut() else { return; }; + let consensus_constants = &global_state.config.consensus_constants; let best_chain = &global_state.transition_frontier.best_chain; let Some(state) = global_state.block_producer.as_mut() else { @@ -220,7 +222,7 @@ impl BlockProducerEnabled { dispatcher.push(BlockProducerEffectfulAction::StagedLedgerDiffCreateSuccess); } BlockProducerAction::BlockUnprovenBuild => { - state.reduce_block_unproved_build(meta.time()); + state.reduce_block_unproved_build(consensus_constants, meta.time()); let dispatcher = state_context.into_dispatcher(); dispatcher.push(BlockProducerEffectfulAction::BlockUnprovenBuild); @@ -351,7 +353,11 @@ impl BlockProducerEnabled { } } - fn reduce_block_unproved_build(&mut self, time: Timestamp) { + fn reduce_block_unproved_build( + &mut self, + consensus_constants: &ConsensusConstants, + time: Timestamp, + ) { let BlockProducerCurrentState::StagedLedgerDiffCreateSuccess { won_slot, chain, @@ -493,7 +499,7 @@ impl BlockProducerEnabled { } else { gt_pred_sub_window || lt_next_sub_window }; - if is_same_global_sub_window || are_windows_overlapping && !within_range { + if is_same_global_sub_window || (are_windows_overlapping && !within_range) { density } else { 0 @@ -501,7 +507,7 @@ impl BlockProducerEnabled { }) .collect::>(); - let grace_period_end = grace_period_end(pred_block.constants()); + let grace_period_end = consensus_constants.grace_period_end; let min_window_density = if is_same_global_sub_window || curr_global_slot_since_hard_fork.slot_number.as_u32() < grace_period_end { From cb199730f8deb21fa10da4b5536602b510e9b1f4 Mon Sep 17 00:00:00 2001 From: Serhii Pimenov Date: Sat, 2 Nov 2024 15:04:59 +0200 Subject: [PATCH 006/175] fix(consensus): Subtract with underflow in `relative_min_window_density()` (#860) * fix subtract with overflow in relative_min_window_density() consensus.rs Panic with message: `Subtract with overflow` at core/src/consensus.rs:78:27 When debug vars: max_slot: 98879 global_slot + 1: 98880 * fix lint issue format code * use saturating_sub isntead of wrapping_sub * fix subtract with overflow in relative_min_window_density() consensus.rs --- .idea/vcs.xml | 1 - core/src/consensus.rs | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c4f6642370..35eb1ddfbb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/core/src/consensus.rs b/core/src/consensus.rs index 5429dbf07d..7b63303c03 100644 --- a/core/src/consensus.rs +++ b/core/src/consensus.rs @@ -75,7 +75,9 @@ pub fn relative_min_window_density(b1: &MinaConsensusState, b2: &MinaConsensusSt let projected_window = { // Compute shift count - let shift_count = (max_slot - global_slot(b1) - 1).clamp(0, SUB_WINDOWS_PER_WINDOW); + let shift_count = max_slot + .saturating_sub(global_slot(b1) + 1) + .min(SUB_WINDOWS_PER_WINDOW); // Initialize projected window let mut projected_window = b1 From 07cbd2cbb46aaf03ca242e570d3d6aaf0ab7f759 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Fri, 1 Nov 2024 17:01:13 -0300 Subject: [PATCH 007/175] tweak: Use `v2` prefix when referencing wire types --- .../block_producer/block_producer_reducer.rs | 77 ++++++++----------- 1 file changed, 34 insertions(+), 43 deletions(-) diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index 9ca3c2e147..5361f92abc 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -1,17 +1,5 @@ use ledger::scan_state::currency::{Amount, Signed}; -use mina_p2p_messages::{ - list::List, - v2::{ - ConsensusProofOfStakeDataConsensusStateValueStableV2, - ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, - ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1, - ConsensusVrfOutputTruncatedStableV1, LedgerProofProdStableV2, - MinaBaseEpochLedgerValueStableV1, MinaStateBlockchainStateValueStableV2, - MinaStateBlockchainStateValueStableV2LedgerProofStatement, - MinaStateProtocolStateBodyValueStableV2, MinaStateProtocolStateValueStableV2, - StagedLedgerDiffBodyStableV1, StateBodyHash, StateHash, UnsignedExtendedUInt32StableV1, - }, -}; +use mina_p2p_messages::{list::List, v2}; use openmina_core::{ block::ArcBlockWithHash, consensus::ConsensusConstants, constants::constraint_constants, }; @@ -395,7 +383,7 @@ impl BlockProducerEnabled { in_same_checkpoint_window(&pred_global_slot, &curr_global_slot_since_hard_fork); let block_stake_winner = won_slot.delegator.0.clone(); - let vrf_truncated_output: ConsensusVrfOutputTruncatedStableV1 = + let vrf_truncated_output: v2::ConsensusVrfOutputTruncatedStableV1 = (*won_slot.vrf_output).clone().into(); let vrf_hash = won_slot.vrf_output.hash(); let block_creator = self.config.pub_key.clone(); @@ -424,7 +412,7 @@ impl BlockProducerEnabled { let next_staking_ledger = if pred_block.snarked_ledger_hash() == genesis_ledger_hash { pred_consensus_state.next_epoch_data.ledger.clone() } else { - MinaBaseEpochLedgerValueStableV1 { + v2::MinaBaseEpochLedgerValueStableV1 { hash: pred_block.snarked_ledger_hash().clone(), total_currency: (&total_currency).into(), } @@ -432,23 +420,25 @@ impl BlockProducerEnabled { let (staking_data, next_data, epoch_count) = if next_epoch > pred_epoch { let staking_data = next_to_staking_epoch_data(&pred_consensus_state.next_epoch_data); - let next_data = ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { - seed: pred_consensus_state.next_epoch_data.seed.clone(), - ledger: next_staking_ledger, - start_checkpoint: pred_block.hash().clone(), - // comment from Mina repo: (* TODO: We need to make sure issue #2328 is properly addressed. *) - lock_checkpoint: StateHash::zero(), - epoch_length: UnsignedExtendedUInt32StableV1(1.into()), - }; - let epoch_count = UnsignedExtendedUInt32StableV1( + let next_data = + v2::ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { + seed: pred_consensus_state.next_epoch_data.seed.clone(), + ledger: next_staking_ledger, + start_checkpoint: pred_block.hash().clone(), + // comment from Mina repo: (* TODO: We need to make sure issue #2328 is properly addressed. *) + lock_checkpoint: v2::StateHash::zero(), + epoch_length: v2::UnsignedExtendedUInt32StableV1(1.into()), + }; + let epoch_count = v2::UnsignedExtendedUInt32StableV1( (pred_consensus_state.epoch_count.as_u32() + 1).into(), ); (staking_data, next_data, epoch_count) } else { assert_eq!(pred_epoch, next_epoch); let mut next_data = pred_consensus_state.next_epoch_data.clone(); - next_data.epoch_length = - UnsignedExtendedUInt32StableV1((next_data.epoch_length.as_u32() + 1).into()); + next_data.epoch_length = v2::UnsignedExtendedUInt32StableV1( + (next_data.epoch_length.as_u32() + 1).into(), + ); ( pred_consensus_state.staking_epoch_data.clone(), next_data, @@ -457,7 +447,7 @@ impl BlockProducerEnabled { }; let next_data = if in_seed_update_range(next_slot, pred_block.constants()) { - ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { + v2::ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { seed: calc_epoch_seed(&next_data.seed, vrf_hash), lock_checkpoint: pred_block.hash().clone(), ..next_data @@ -471,6 +461,7 @@ impl BlockProducerEnabled { let (min_window_density, sub_window_densities) = { // TODO(binier): when should this be false? + // https://github.com/MinaProtocol/mina/blob/4aac38814556b9641ffbdfaef19b38ab7980011b/src/lib/consensus/proof_of_stake.ml#L2864 let incr_window = true; let pred_sub_window_densities = &pred_consensus_state.sub_window_densities; @@ -518,7 +509,7 @@ impl BlockProducerEnabled { .min_window_density .as_u32() .min(cur_density); - UnsignedExtendedUInt32StableV1(min_density.into()) + v2::UnsignedExtendedUInt32StableV1(min_density.into()) }; let next_sub_window_densities = current_sub_window_densities @@ -542,14 +533,14 @@ impl BlockProducerEnabled { density } }) - .map(|v| UnsignedExtendedUInt32StableV1(v.into())) + .map(|v| v2::UnsignedExtendedUInt32StableV1(v.into())) .collect(); (min_window_density, next_sub_window_densities) }; - let consensus_state = ConsensusProofOfStakeDataConsensusStateValueStableV2 { - blockchain_length: UnsignedExtendedUInt32StableV1((pred_block.height() + 1).into()), + let consensus_state = v2::ConsensusProofOfStakeDataConsensusStateValueStableV2 { + blockchain_length: v2::UnsignedExtendedUInt32StableV1((pred_block.height() + 1).into()), epoch_count, min_window_density, sub_window_densities, @@ -567,9 +558,9 @@ impl BlockProducerEnabled { supercharge_coinbase: constraint_constants().supercharged_coinbase_factor != 0, }; - let protocol_state = MinaStateProtocolStateValueStableV2 { + let protocol_state = v2::MinaStateProtocolStateValueStableV2 { previous_state_hash: pred_block.hash().clone(), - body: MinaStateProtocolStateBodyValueStableV2 { + body: v2::MinaStateProtocolStateBodyValueStableV2 { genesis_state_hash: if pred_block.is_genesis() { pred_block.hash().clone() } else { @@ -581,7 +572,7 @@ impl BlockProducerEnabled { .clone() }, constants: pred_block.header().protocol_state.body.constants.clone(), - blockchain_state: MinaStateBlockchainStateValueStableV2 { + blockchain_state: v2::MinaStateBlockchainStateValueStableV2 { staged_ledger_hash: staged_ledger_hash.clone(), genesis_ledger_hash: genesis_ledger_hash.clone(), ledger_proof_statement, @@ -602,7 +593,7 @@ impl BlockProducerEnabled { let first_hash = first_block.hash().clone(); let body_hashes = iter .filter_map(|b| b.header().protocol_state.body.try_hash().ok()) // TODO: Handle error ? - .map(StateBodyHash::from) + .map(v2::StateBodyHash::from) .collect(); (first_hash, body_hashes) } else { @@ -618,7 +609,7 @@ impl BlockProducerEnabled { delta_block_chain_proof, current_protocol_version: pred_block.header().current_protocol_version.clone(), proposed_protocol_version_opt, - body: StagedLedgerDiffBodyStableV1 { + body: v2::StagedLedgerDiffBodyStableV1 { staged_ledger_diff: diff.clone(), }, }; @@ -711,9 +702,9 @@ impl BlockProducerEnabled { } fn next_to_staking_epoch_data( - data: &ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, -) -> ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { - ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { + data: &v2::ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, +) -> v2::ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { + v2::ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { seed: data.seed.clone(), ledger: data.ledger.clone(), start_checkpoint: data.start_checkpoint.clone(), @@ -723,12 +714,12 @@ fn next_to_staking_epoch_data( } fn ledger_proof_statement_from_emitted_proof( - emitted_ledger_proof: Option<&LedgerProofProdStableV2>, - pred_proof_statement: &MinaStateBlockchainStateValueStableV2LedgerProofStatement, -) -> MinaStateBlockchainStateValueStableV2LedgerProofStatement { + emitted_ledger_proof: Option<&v2::LedgerProofProdStableV2>, + pred_proof_statement: &v2::MinaStateBlockchainStateValueStableV2LedgerProofStatement, +) -> v2::MinaStateBlockchainStateValueStableV2LedgerProofStatement { match emitted_ledger_proof.map(|proof| &proof.statement) { None => pred_proof_statement.clone(), - Some(stmt) => MinaStateBlockchainStateValueStableV2LedgerProofStatement { + Some(stmt) => v2::MinaStateBlockchainStateValueStableV2LedgerProofStatement { source: stmt.source.clone(), target: stmt.target.clone(), connecting_ledger_left: stmt.connecting_ledger_left.clone(), From 3a792cba34faab178efea7096e099b3924e30d8c Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Fri, 1 Nov 2024 17:02:57 -0300 Subject: [PATCH 008/175] fix(block-producer): Fix computation of `supercharge_coinbase` --- ledger/src/staged_ledger/staged_ledger.rs | 2 +- .../block_producer/block_producer_reducer.rs | 26 +++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ledger/src/staged_ledger/staged_ledger.rs b/ledger/src/staged_ledger/staged_ledger.rs index 06af06cdff..a2527c0b4b 100644 --- a/ledger/src/staged_ledger/staged_ledger.rs +++ b/ledger/src/staged_ledger/staged_ledger.rs @@ -1692,7 +1692,7 @@ impl StagedLedger { } /// https://github.com/MinaProtocol/mina/blob/05c2f73d0f6e4f1341286843814ce02dcb3919e0/src/lib/staged_ledger/staged_ledger.ml#L1781 - fn can_apply_supercharged_coinbase_exn( + pub fn can_apply_supercharged_coinbase_exn( winner: CompressedPubKey, epoch_ledger: &SparseLedger, global_slot: Slot, diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index 5361f92abc..87ec1a0fa2 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -539,6 +539,11 @@ impl BlockProducerEnabled { (min_window_density, next_sub_window_densities) }; + let supercharge_coinbase = can_apply_supercharged_coinbase( + &block_stake_winner, + &stake_proof_sparse_ledger, + &global_slot_since_genesis, + ); let consensus_state = v2::ConsensusProofOfStakeDataConsensusStateValueStableV2 { blockchain_length: v2::UnsignedExtendedUInt32StableV1((pred_block.height() + 1).into()), epoch_count, @@ -554,8 +559,7 @@ impl BlockProducerEnabled { block_stake_winner, block_creator, coinbase_receiver, - // TODO(binier): Staged_ledger.can_apply_supercharged_coinbase_exn - supercharge_coinbase: constraint_constants().supercharged_coinbase_factor != 0, + supercharge_coinbase, }; let protocol_state = v2::MinaStateProtocolStateValueStableV2 { @@ -701,6 +705,24 @@ impl BlockProducerEnabled { } } +fn can_apply_supercharged_coinbase( + block_stake_winner: &v2::NonZeroCurvePoint, + stake_proof_sparse_ledger: &v2::MinaBaseSparseLedgerBaseStableV2, + global_slot_since_genesis: &v2::MinaNumbersGlobalSlotSinceGenesisMStableV1, +) -> bool { + use ledger::staged_ledger::staged_ledger::StagedLedger; + + let winner = (block_stake_winner) + .try_into() + .expect("Public key being used cannot be invalid here"); + let epoch_ledger = (stake_proof_sparse_ledger) + .try_into() + .expect("Sparse ledger being used cannot be invalid here"); + let global_slot = (global_slot_since_genesis).into(); + + StagedLedger::can_apply_supercharged_coinbase_exn(winner, &epoch_ledger, global_slot) +} + fn next_to_staking_epoch_data( data: &v2::ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, ) -> v2::ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { From 5c542656f52f0c8c3babfc2021731bb8ee55fca3 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sat, 2 Nov 2024 17:30:08 +0400 Subject: [PATCH 009/175] fix(transition_frontier/genesis): genesis account in ledger must be first, not last --- .../genesis/transition_frontier_genesis_config.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs index 9275e50e67..238b6425fb 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs @@ -429,7 +429,7 @@ impl GenesisConfig { account } - let mut accounts = Vec::new(); + let mut accounts = genesis_account_iter().map(Ok).collect::>(); // Process block producers and their delegators for (bp_balance, delegators) in block_producers { @@ -476,11 +476,6 @@ impl GenesisConfig { } } - // Add genesis accounts - for genesis_account in genesis_account_iter() { - accounts.push(Ok(genesis_account)); - } - Self::build_ledger_from_accounts(accounts) } From b17e3b0e70ec7b7761064eda30f3f1442b089f63 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Sat, 2 Nov 2024 10:45:13 -0300 Subject: [PATCH 010/175] chore: Remove unused `grace_period_end` function (#862) --- core/src/consensus.rs | 2 +- core/src/constants.rs | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/core/src/consensus.rs b/core/src/consensus.rs index 7b63303c03..5cd9bc2e76 100644 --- a/core/src/consensus.rs +++ b/core/src/consensus.rs @@ -7,7 +7,7 @@ use time::{macros::format_description, OffsetDateTime}; use crate::constants::constraint_constants; pub use crate::constants::{ - checkpoint_window_size_in_slots, grace_period_end, slots_per_window, CHECKPOINTS_PER_YEAR, + checkpoint_window_size_in_slots, slots_per_window, CHECKPOINTS_PER_YEAR, }; // TODO get constants from elsewhere diff --git a/core/src/constants.rs b/core/src/constants.rs index 7d99d64772..070adfbddc 100644 --- a/core/src/constants.rs +++ b/core/src/constants.rs @@ -107,19 +107,6 @@ pub fn checkpoint_window_size_in_slots() -> u32 { size_in_slots as u32 } -pub fn grace_period_end(constants: &v2::MinaBaseProtocolConstantsCheckedValueStableV1) -> u32 { - let slots = { - const NUM_DAYS: u64 = 3; - let n_days_ms = days_to_ms(NUM_DAYS); - let n_days = n_days_ms / constraint_constants().block_window_duration_ms; - (n_days as u32).min(constants.slots_per_epoch.as_u32()) - }; - match constraint_constants().fork.as_ref() { - None => slots, - Some(fork) => slots + fork.global_slot_since_genesis, - } -} - pub const DEFAULT_GENESIS_TIMESTAMP_MILLISECONDS: u64 = 1707157200000; pub const PROTOCOL_TRANSACTION_VERSION: u8 = 3; From dd675ea103e9f6476f53e9b473bde9cf7bd4e957 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sat, 2 Nov 2024 20:20:33 +0400 Subject: [PATCH 011/175] perf(node): load prover indexes in parallel with bootstrap to reduce startup time closes: #751 --- cli/src/commands/node/mod.rs | 10 +- core/src/thread.rs | 18 ++ ledger/src/proofs/circuit_blobs.rs | 19 +- ledger/src/proofs/provers.rs | 199 ++---------------- ledger/src/proofs/verifiers.rs | 2 +- node/common/src/service/block_producer/mod.rs | 9 +- node/common/src/service/builder.rs | 4 +- node/native/src/node/builder.rs | 12 +- node/native/src/service/builder.rs | 4 +- node/testing/src/cluster/mod.rs | 2 +- node/web/src/lib.rs | 13 +- node/web/src/node/builder.rs | 8 +- 12 files changed, 92 insertions(+), 208 deletions(-) diff --git a/cli/src/commands/node/mod.rs b/cli/src/commands/node/mod.rs index fde5d76d9a..aa6b2897c1 100644 --- a/cli/src/commands/node/mod.rs +++ b/cli/src/commands/node/mod.rs @@ -226,10 +226,12 @@ impl Node { if let Some(producer_key_path) = self.producer_key { let password = &self.producer_key_password; - node::core::info!(node::core::log::system_time(); summary = "loading provers index"); - let provers = BlockProver::make(Some(block_verifier_index), Some(work_verifier_index)); - node::core::info!(node::core::log::system_time(); summary = "loaded provers index"); - node_builder.block_producer_from_file(provers, producer_key_path, password)?; + openmina_core::thread::spawn(|| { + node::core::info!(node::core::log::system_time(); summary = "loading provers index"); + BlockProver::make(Some(block_verifier_index), Some(work_verifier_index)); + node::core::info!(node::core::log::system_time(); summary = "loaded provers index"); + }); + node_builder.block_producer_from_file(producer_key_path, password, None)?; if let Some(pub_key) = self.coinbase_receiver { node_builder diff --git a/core/src/thread.rs b/core/src/thread.rs index daabd4fc67..7752288db6 100644 --- a/core/src/thread.rs +++ b/core/src/thread.rs @@ -73,6 +73,24 @@ mod main_thread { })); rx.await.ok() } + + pub fn run_async_fn_in_main_thread_blocking(f: F) -> Option + where + T: 'static + Send, + FU: Future, + F: 'static + Send + FnOnce() -> FU, + { + let sender = MAIN_THREAD_TASK_SENDER + .get() + .expect("main thread not initialized"); + let (tx, rx) = oneshot::channel(); + let _ = sender.send(Box::pin(async move { + wasm_bindgen_futures::spawn_local(async move { + let _ = tx.send(f().await); + }) + })); + rx.blocking_recv().ok() + } } #[cfg(target_family = "wasm")] pub use main_thread::*; diff --git a/ledger/src/proofs/circuit_blobs.rs b/ledger/src/proofs/circuit_blobs.rs index ed89c42852..af19c7dc2a 100644 --- a/ledger/src/proofs/circuit_blobs.rs +++ b/ledger/src/proofs/circuit_blobs.rs @@ -36,6 +36,15 @@ mod http { _get_bytes(url).await } } + + pub fn get_bytes_blocking(url: &str) -> std::io::Result> { + let url = url.to_owned(); + if thread::is_web_worker_thread() { + thread::run_async_fn_in_main_thread_blocking(move || _get_bytes(url)).expect("failed to run task in the main thread! Maybe main thread crashed or not initialized?") + } else { + panic!("can't do blocking requests from main browser thread"); + } + } } #[cfg(not(target_family = "wasm"))] @@ -53,7 +62,7 @@ fn git_release_url(filename: &impl AsRef) -> String { } #[cfg(not(target_family = "wasm"))] -pub fn fetch(filename: &impl AsRef) -> std::io::Result> { +pub fn fetch_blocking(filename: &impl AsRef) -> std::io::Result> { use std::path::PathBuf; fn try_base_dir>(base_dir: P, filename: &impl AsRef) -> Option { @@ -124,3 +133,11 @@ pub async fn fetch(filename: &impl AsRef) -> std::io::Result> { http::get_bytes(&url).await // http::get_bytes(&git_release_url(filename)).await } + +#[cfg(target_family = "wasm")] +pub fn fetch_blocking(filename: &impl AsRef) -> std::io::Result> { + let prefix = + option_env!("CIRCUIT_BLOBS_HTTP_PREFIX").unwrap_or("/assets/webnode/circuit-blobs"); + let url = format!("{prefix}/{}", filename.as_ref().to_str().unwrap()); + http::get_bytes_blocking(&url) +} diff --git a/ledger/src/proofs/provers.rs b/ledger/src/proofs/provers.rs index 1e1da34c12..3afd8aa71c 100644 --- a/ledger/src/proofs/provers.rs +++ b/ledger/src/proofs/provers.rs @@ -50,23 +50,13 @@ fn decode_gates_file( Ok(data.gates) } -#[cfg(not(target_family = "wasm"))] fn read_gates_file( filename: &impl AsRef, ) -> std::io::Result>> { - let bytes = circuit_blobs::fetch(filename)?; + let bytes = circuit_blobs::fetch_blocking(filename)?; decode_gates_file(bytes.as_slice()) } -#[cfg(target_family = "wasm")] -async fn read_gates_file( - filepath: &impl AsRef, -) -> std::io::Result>> { - let resp = circuit_blobs::fetch(filepath).await?; - decode_gates_file(&mut resp.as_slice()) -} - -#[cfg(not(target_family = "wasm"))] fn make_gates( filename: &str, ) -> ( @@ -88,30 +78,6 @@ fn make_gates( (internal_vars_path, rows_rev_path, gates) } -#[cfg(target_family = "wasm")] -async fn make_gates( - filename: &str, -) -> ( - HashMap, Option)>, - Vec>>, - Vec>, -) { - let circuits_config = openmina_core::NetworkConfig::global().circuits_config; - let base_dir = Path::new(circuits_config.directory_name); - - let internal_vars_path = base_dir.join(format!("{}_internal_vars.bin", filename)); - let rows_rev_path = base_dir.join(format!("{}_rows_rev.bin", filename)); - let gates_path = base_dir.join(format!("{}_gates.json", filename)); - - let gates: Vec> = read_gates_file(&gates_path).await.unwrap(); - let (internal_vars_path, rows_rev_path) = - read_constraints_data::(&internal_vars_path, &rows_rev_path) - .await - .unwrap(); - - (internal_vars_path, rows_rev_path, gates) -} - macro_rules! get_or_make { ($constant: ident, $type: ty, $filename: expr) => {{ get_or_make!($constant, $type, None, $filename) @@ -121,13 +87,7 @@ macro_rules! get_or_make { return prover.clone(); } - let (internal_vars, rows_rev, gates) = { - #[cfg(not(target_family = "wasm"))] - let res = make_gates($filename); - #[cfg(target_family = "wasm")] - let res = make_gates($filename).await; - res - }; + let (internal_vars, rows_rev, gates) = make_gates($filename); let index = make_prover_index::<$type, _>(gates, $verifier_index); let prover = Prover { @@ -153,7 +113,6 @@ fn default_circuits_config() -> &'static CircuitsConfig { openmina_core::NetworkConfig::global().circuits_config } -#[cfg(not(target_family = "wasm"))] mod prover_makers { use super::*; @@ -274,128 +233,6 @@ mod prover_makers { } } -#[cfg(target_family = "wasm")] -mod prover_makers { - use super::*; - - async fn get_or_make_tx_step_prover(config: &CircuitsConfig) -> Arc> { - get_or_make!( - TX_STEP_PROVER, - StepTransactionProof, - config.step_transaction_gates - ) - } - async fn get_or_make_tx_wrap_prover( - config: &CircuitsConfig, - verifier_index: Option, - ) -> Arc> { - get_or_make!( - TX_WRAP_PROVER, - WrapTransactionProof, - verifier_index.map(Into::into), - config.wrap_transaction_gates - ) - } - async fn get_or_make_merge_step_prover(config: &CircuitsConfig) -> Arc> { - get_or_make!(MERGE_STEP_PROVER, StepMergeProof, config.step_merge_gates) - } - async fn get_or_make_block_step_prover(config: &CircuitsConfig) -> Arc> { - get_or_make!( - BLOCK_STEP_PROVER, - StepBlockProof, - config.step_blockchain_gates - ) - } - async fn get_or_make_block_wrap_prover( - config: &CircuitsConfig, - verifier_index: Option, - ) -> Arc> { - get_or_make!( - BLOCK_WRAP_PROVER, - WrapBlockProof, - verifier_index.map(Into::into), - config.wrap_blockchain_gates - ) - } - async fn get_or_make_zkapp_step_opt_signed_opt_signed_prover( - config: &CircuitsConfig, - ) -> Arc> { - get_or_make!( - ZKAPP_STEP_OPT_SIGNED_OPT_SIGNED_PROVER, - StepZkappOptSignedOptSignedProof, - config.step_transaction_opt_signed_opt_signed_gates - ) - } - async fn get_or_make_zkapp_step_opt_signed_prover(config: &CircuitsConfig) -> Arc> { - get_or_make!( - ZKAPP_STEP_OPT_SIGNED_PROVER, - StepZkappOptSignedProof, - config.step_transaction_opt_signed_gates - ) - } - async fn get_or_make_zkapp_step_proof_prover(config: &CircuitsConfig) -> Arc> { - get_or_make!( - ZKAPP_STEP_PROOF_PROVER, - StepZkappProvedProof, - config.step_transaction_proved_gates - ) - } - - impl BlockProver { - pub async fn make( - block_verifier_index: Option, - tx_verifier_index: Option, - ) -> Self { - let config = default_circuits_config(); - let block_step_prover = get_or_make_block_step_prover(config).await; - let block_wrap_prover = - get_or_make_block_wrap_prover(config, block_verifier_index).await; - let tx_wrap_prover = get_or_make_tx_wrap_prover(config, tx_verifier_index).await; - - Self { - block_step_prover, - block_wrap_prover, - tx_wrap_prover, - } - } - } - - impl TransactionProver { - pub async fn make(tx_verifier_index: Option) -> Self { - let config = default_circuits_config(); - let tx_step_prover = get_or_make_tx_step_prover(config).await; - let tx_wrap_prover = get_or_make_tx_wrap_prover(config, tx_verifier_index).await; - let merge_step_prover = get_or_make_merge_step_prover(config).await; - - Self { - tx_step_prover, - tx_wrap_prover, - merge_step_prover, - } - } - } - - impl ZkappProver { - pub async fn make(tx_verifier_index: Option) -> Self { - let config = default_circuits_config(); - let tx_wrap_prover = get_or_make_tx_wrap_prover(config, tx_verifier_index).await; - let merge_step_prover = get_or_make_merge_step_prover(config).await; - let step_opt_signed_opt_signed_prover = - get_or_make_zkapp_step_opt_signed_opt_signed_prover(config).await; - let step_opt_signed_prover = get_or_make_zkapp_step_opt_signed_prover(config).await; - let step_proof_prover = get_or_make_zkapp_step_proof_prover(config).await; - - Self { - tx_wrap_prover, - merge_step_prover, - step_opt_signed_opt_signed_prover, - step_opt_signed_prover, - step_proof_prover, - } - } - } -} - #[derive(Clone)] pub struct BlockProver { pub block_step_prover: Arc>, @@ -419,6 +256,18 @@ pub struct ZkappProver { pub step_proof_prover: Arc>, } +impl BlockProver { + /// Called must make sure that before calling this, + /// `BlockProver::make` call was made. + pub fn get_once_made() -> Self { + Self { + block_step_prover: BLOCK_STEP_PROVER.wait().clone(), + block_wrap_prover: BLOCK_WRAP_PROVER.wait().clone(), + tx_wrap_prover: TX_WRAP_PROVER.wait().clone(), + } + } +} + fn decode_constraints_data( mut internal_vars: &[u8], mut rows_rev: &[u8], @@ -471,31 +320,15 @@ fn decode_constraints_data( Some((internal_vars, rows_rev)) } -#[cfg(not(target_family = "wasm"))] fn read_constraints_data( internal_vars_path: &Path, rows_rev_path: &Path, ) -> Option<(InternalVars, Vec>>)> { // ((Fp.t * V.t) list * Fp.t option) - let internal_vars = circuit_blobs::fetch(&internal_vars_path).ok()?; + let internal_vars = circuit_blobs::fetch_blocking(&internal_vars_path).ok()?; // V.t option array list - let rows_rev = circuit_blobs::fetch(&rows_rev_path).ok()?; + let rows_rev = circuit_blobs::fetch_blocking(&rows_rev_path).ok()?; decode_constraints_data(internal_vars.as_slice(), rows_rev.as_slice()) } - -#[cfg(target_family = "wasm")] -async fn read_constraints_data( - internal_vars_path: &Path, - rows_rev_path: &Path, -) -> Option<(InternalVars, Vec>>)> { - // ((Fp.t * V.t) list * Fp.t option) - let internal_vars = circuit_blobs::fetch(&internal_vars_path).await.ok()?; - - // V.t option array list - let rows_rev = circuit_blobs::fetch(&rows_rev_path).await.ok()?; - // std::fs::read(Path::new(env!("CARGO_MANIFEST_DIR")).join("rows_rev.bin")).unwrap(); - - decode_constraints_data(internal_vars.as_ref(), rows_rev.as_ref()) -} diff --git a/ledger/src/proofs/verifiers.rs b/ledger/src/proofs/verifiers.rs index 3ede6d9be7..a0acd68096 100644 --- a/ledger/src/proofs/verifiers.rs +++ b/ledger/src/proofs/verifiers.rs @@ -71,7 +71,7 @@ fn cache_path(kind: Kind) -> Option { macro_rules! read_cache { ($kind: expr, $digest: expr) => {{ #[cfg(not(target_family = "wasm"))] - let data = super::circuit_blobs::fetch(&cache_filename($kind)) + let data = super::circuit_blobs::fetch_blocking(&cache_filename($kind)) .context("fetching verifier index failed")?; #[cfg(target_family = "wasm")] let data = super::circuit_blobs::fetch(&cache_filename($kind)) diff --git a/node/common/src/service/block_producer/mod.rs b/node/common/src/service/block_producer/mod.rs index afb8288b79..e8a365ad39 100644 --- a/node/common/src/service/block_producer/mod.rs +++ b/node/common/src/service/block_producer/mod.rs @@ -16,16 +16,16 @@ use node::{ use crate::EventSender; pub struct BlockProducerService { - provers: BlockProver, + provers: Option, keypair: AccountSecretKey, vrf_evaluation_sender: mpsc::UnboundedSender, } impl BlockProducerService { pub fn new( - provers: BlockProver, keypair: AccountSecretKey, vrf_evaluation_sender: mpsc::UnboundedSender, + provers: Option, ) -> Self { Self { provers, @@ -35,9 +35,9 @@ impl BlockProducerService { } pub fn start( - provers: BlockProver, event_sender: EventSender, keypair: AccountSecretKey, + provers: Option, ) -> Self { let (vrf_evaluation_sender, vrf_evaluation_receiver) = mpsc::unbounded_channel::(); @@ -54,7 +54,7 @@ impl BlockProducerService { }) .unwrap(); - BlockProducerService::new(provers, keypair, vrf_evaluation_sender) + BlockProducerService::new(keypair, vrf_evaluation_sender, provers) } pub fn keypair(&self) -> AccountSecretKey { @@ -103,6 +103,7 @@ impl node::service::BlockProducerService for crate::NodeService { .expect("provers shouldn't be needed if block producer isn't initialized") .provers .clone() + .unwrap_or_else(|| BlockProver::get_once_made()) } fn prove(&mut self, block_hash: StateHash, input: Box) { diff --git a/node/common/src/service/builder.rs b/node/common/src/service/builder.rs index 6ecbc9e3af..6b724ae3c3 100644 --- a/node/common/src/service/builder.rs +++ b/node/common/src/service/builder.rs @@ -80,13 +80,13 @@ impl NodeServiceCommonBuilder { pub fn block_producer_init( &mut self, - provers: BlockProver, keypair: AccountSecretKey, + provers: Option, ) -> &mut Self { self.block_producer = Some(BlockProducerService::start( - provers, self.event_sender.clone(), keypair, + provers, )); self } diff --git a/node/native/src/node/builder.rs b/node/native/src/node/builder.rs index f8400cd91b..dfe21a6406 100644 --- a/node/native/src/node/builder.rs +++ b/node/native/src/node/builder.rs @@ -174,27 +174,31 @@ impl NodeBuilder { } /// Set up block producer. - pub fn block_producer(&mut self, provers: BlockProver, key: AccountSecretKey) -> &mut Self { + pub fn block_producer( + &mut self, + key: AccountSecretKey, + provers: Option, + ) -> &mut Self { let config = BlockProducerConfig { pub_key: key.public_key().into(), custom_coinbase_receiver: None, proposed_protocol_version: None, }; self.block_producer = Some(config); - self.service.block_producer_init(provers, key); + self.service.block_producer_init(key, provers); self } /// Set up block producer using keys from file. pub fn block_producer_from_file( &mut self, - provers: BlockProver, path: impl AsRef, password: &str, + provers: Option, ) -> anyhow::Result<&mut Self> { let key = AccountSecretKey::from_encrypted_file(path, password) .context("Failed to decrypt secret key file")?; - Ok(self.block_producer(provers, key)) + Ok(self.block_producer(key, provers)) } /// Receive block producer's coinbase reward to another account. diff --git a/node/native/src/service/builder.rs b/node/native/src/service/builder.rs index a258f6f6ab..abb4d156ec 100644 --- a/node/native/src/service/builder.rs +++ b/node/native/src/service/builder.rs @@ -46,10 +46,10 @@ impl NodeServiceBuilder { pub fn block_producer_init( &mut self, - provers: BlockProver, keypair: AccountSecretKey, + provers: Option, ) -> &mut Self { - self.common.block_producer_init(provers, keypair); + self.common.block_producer_init(keypair, provers); self } diff --git a/node/testing/src/cluster/mod.rs b/node/testing/src/cluster/mod.rs index 8a39c95553..c117ef07bf 100644 --- a/node/testing/src/cluster/mod.rs +++ b/node/testing/src/cluster/mod.rs @@ -321,7 +321,7 @@ impl Cluster { if let Some(keypair) = block_producer_sec_key { let provers = BlockProver::make(None, None); - service_builder.block_producer_init(provers, keypair); + service_builder.block_producer_init(keypair, provers); } let real_service = service_builder diff --git a/node/web/src/lib.rs b/node/web/src/lib.rs index 5d8c0a5f89..d7c4c10946 100644 --- a/node/web/src/lib.rs +++ b/node/web/src/lib.rs @@ -45,7 +45,7 @@ pub async fn run(block_producer: Option) -> RpcSender { node.run_forever().await; }); - wasm_bindgen::throw_str("Cursed hack to keep workers alive. See https://github.com/rustwasm/wasm-bindgen/issues/2945"); + keep_worker_alive_cursed_hack(); }); rpc_sender_rx.await.unwrap() @@ -64,9 +64,10 @@ async fn setup_node( .work_verifier_index(work_verifier_index.clone()); if let Some(bp_key) = block_producer { - let provers = - BlockProver::make(Some(block_verifier_index), Some(work_verifier_index)).await; - node_builder.block_producer(provers, bp_key); + thread::spawn(move || { + BlockProver::make(Some(block_verifier_index), Some(work_verifier_index)); + }); + node_builder.block_producer(bp_key, None); } node_builder @@ -75,3 +76,7 @@ async fn setup_node( node_builder.gather_stats(); node_builder.build().context("node build failed!").unwrap() } + +fn keep_worker_alive_cursed_hack() { + wasm_bindgen::throw_str("Cursed hack to keep workers alive. See https://github.com/rustwasm/wasm-bindgen/issues/2945"); +} diff --git a/node/web/src/node/builder.rs b/node/web/src/node/builder.rs index 70c9a119c8..b9e93beac6 100644 --- a/node/web/src/node/builder.rs +++ b/node/web/src/node/builder.rs @@ -117,14 +117,18 @@ impl NodeBuilder { } /// Set up block producer. - pub fn block_producer(&mut self, provers: BlockProver, key: AccountSecretKey) -> &mut Self { + pub fn block_producer( + &mut self, + key: AccountSecretKey, + provers: Option, + ) -> &mut Self { let config = BlockProducerConfig { pub_key: key.public_key().into(), custom_coinbase_receiver: None, proposed_protocol_version: None, }; self.block_producer = Some(config); - self.service.block_producer_init(provers, key); + self.service.block_producer_init(key, provers); self } From 336c842935fceb977541adca6d7629061bffc156 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sat, 2 Nov 2024 20:21:39 +0400 Subject: [PATCH 012/175] fix(node): producing genesis proof even when not needed Unable to calculate current slot without getting synced first --- node/common/src/service/block_producer/mod.rs | 2 +- node/src/state.rs | 11 ++++++----- node/testing/src/cluster/mod.rs | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/node/common/src/service/block_producer/mod.rs b/node/common/src/service/block_producer/mod.rs index e8a365ad39..df6427f2b2 100644 --- a/node/common/src/service/block_producer/mod.rs +++ b/node/common/src/service/block_producer/mod.rs @@ -103,7 +103,7 @@ impl node::service::BlockProducerService for crate::NodeService { .expect("provers shouldn't be needed if block producer isn't initialized") .provers .clone() - .unwrap_or_else(|| BlockProver::get_once_made()) + .unwrap_or_else(BlockProver::get_once_made) } fn prove(&mut self, block_hash: StateHash, input: Box) { diff --git a/node/src/state.rs b/node/src/state.rs index f62f3abdd3..a0b4735aed 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -290,12 +290,12 @@ impl State { } fn cur_slot(&self, initial_slot: impl FnOnce(&ArcBlockWithHash) -> u32) -> Option { - let best_tip = self.transition_frontier.best_tip()?; - let best_tip_ms = u64::from(best_tip.timestamp()) / 1_000_000; + let genesis = self.genesis_block()?; + let initial_ms = u64::from(genesis.timestamp()) / 1_000_000; let now_ms = u64::from(self.time()) / 1_000_000; - let ms = now_ms.saturating_sub(best_tip_ms); + let ms = now_ms.saturating_sub(initial_ms); let slots = ms / constraint_constants().block_window_duration_ms; - Some(initial_slot(best_tip) + slots as u32) + Some(initial_slot(&genesis) + slots as u32) } /// Current global slot based on constants and current time. @@ -306,7 +306,8 @@ impl State { } pub fn current_slot(&self) -> Option { - self.cur_slot(|b| b.global_slot() % b.constants().slots_per_epoch.as_u32()) + let slots_per_epoch = self.genesis_block()?.constants().slots_per_epoch.as_u32(); + Some(self.cur_global_slot()? % slots_per_epoch) } pub fn cur_global_slot_since_genesis(&self) -> Option { diff --git a/node/testing/src/cluster/mod.rs b/node/testing/src/cluster/mod.rs index c117ef07bf..69f976b924 100644 --- a/node/testing/src/cluster/mod.rs +++ b/node/testing/src/cluster/mod.rs @@ -321,7 +321,7 @@ impl Cluster { if let Some(keypair) = block_producer_sec_key { let provers = BlockProver::make(None, None); - service_builder.block_producer_init(keypair, provers); + service_builder.block_producer_init(keypair, Some(provers)); } let real_service = service_builder From c09a53825d7920ff58a7ce91d711922c6ef0e754 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sat, 2 Nov 2024 20:37:05 +0400 Subject: [PATCH 013/175] fix(logging): disconnection reason not logged --- node/src/block_producer/block_producer_actions.rs | 1 + node/src/p2p/callbacks/p2p_callbacks_reducer.rs | 4 +--- p2p/src/disconnection/p2p_disconnection_actions.rs | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/node/src/block_producer/block_producer_actions.rs b/node/src/block_producer/block_producer_actions.rs index e234f33495..5b33c7f7cf 100644 --- a/node/src/block_producer/block_producer_actions.rs +++ b/node/src/block_producer/block_producer_actions.rs @@ -60,6 +60,7 @@ pub enum BlockProducerAction { proof: Box, }, BlockProduced, + #[action_event(level = trace)] BlockInject, BlockInjected, } diff --git a/node/src/p2p/callbacks/p2p_callbacks_reducer.rs b/node/src/p2p/callbacks/p2p_callbacks_reducer.rs index 2b24054fba..d540a11d20 100644 --- a/node/src/p2p/callbacks/p2p_callbacks_reducer.rs +++ b/node/src/p2p/callbacks/p2p_callbacks_reducer.rs @@ -287,9 +287,7 @@ impl crate::State { let response = None.or_else(|| { let best_tip = best_chain.last()?; let mut chain_iter = best_chain.iter(); - let root_block = chain_iter.next(); - // when our best tip is genesis block. - let root_block = root_block.unwrap_or(best_tip); + let root_block = chain_iter.next()?; // TODO(binier): cache body hashes let Ok(body_hashes) = chain_iter .map(|b| b.header().protocol_state.body.try_hash()) diff --git a/p2p/src/disconnection/p2p_disconnection_actions.rs b/p2p/src/disconnection/p2p_disconnection_actions.rs index aec90cef41..6a9b011e8d 100644 --- a/p2p/src/disconnection/p2p_disconnection_actions.rs +++ b/p2p/src/disconnection/p2p_disconnection_actions.rs @@ -7,7 +7,7 @@ use crate::{P2pPeerStatus, P2pState, PeerId}; pub type P2pDisconnectionActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pDisconnectionAction>; #[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] -#[action_event(fields(display(peer_id), display(reason)), level = info)] +#[action_event(level = debug)] pub enum P2pDisconnectionAction { /// Initialize disconnection. #[action_event(fields(display(peer_id), display(reason)), level = info)] @@ -16,7 +16,7 @@ pub enum P2pDisconnectionAction { reason: P2pDisconnectionReason, }, /// Finish disconnecting from a peer. - #[action_event(level = debug)] + #[action_event(fields(display(peer_id)), level = debug)] Finish { peer_id: PeerId }, } From 096241eaf656905f7115f48a43dcc864d828cdd6 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sat, 2 Nov 2024 21:26:48 +0400 Subject: [PATCH 014/175] fix(docker/frontend): download verifier indexes to assets as well --- frontend/docker/startup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/docker/startup.sh b/frontend/docker/startup.sh index 7f167362f2..f92157a6d1 100644 --- a/frontend/docker/startup.sh +++ b/frontend/docker/startup.sh @@ -27,6 +27,8 @@ download_circuit_files() { CIRCUITS_VERSION="3.0.1devnet" DEVNET_CIRCUIT_FILES=( + "block_verifier_index.postcard" + "transaction_verifier_index.postcard" "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_gates.json" "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_internal_vars.bin" "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_rows_rev.bin" From e877d0c2b2dc8ab6eed25c92937e0e5f7b28bff0 Mon Sep 17 00:00:00 2001 From: Vladislav Melnik Date: Mon, 4 Nov 2024 11:55:10 +0100 Subject: [PATCH 015/175] (fix): prefer declared external IP instead of observed address --- p2p/src/connection/outgoing/mod.rs | 38 ++++++++++++++++++++++++ p2p/src/identify/p2p_identify_reducer.rs | 4 +++ 2 files changed, 42 insertions(+) diff --git a/p2p/src/connection/outgoing/mod.rs b/p2p/src/connection/outgoing/mod.rs index 6bed5c356e..e9b6bdf6ea 100644 --- a/p2p/src/connection/outgoing/mod.rs +++ b/p2p/src/connection/outgoing/mod.rs @@ -6,11 +6,13 @@ pub use p2p_connection_outgoing_actions::*; mod p2p_connection_outgoing_reducer; +use std::net::IpAddr; #[cfg(feature = "p2p-libp2p")] use std::net::SocketAddr; use std::{fmt, str::FromStr}; use binprot_derive::{BinProtRead, BinProtWrite}; +use multiaddr::{Multiaddr, Protocol}; use serde::{Deserialize, Serialize}; use thiserror::Error; @@ -44,6 +46,42 @@ pub struct P2pConnectionOutgoingInitLibp2pOpts { pub port: u16, } +impl P2pConnectionOutgoingInitLibp2pOpts { + /// If the current host is local and there is a better host among the `addrs`, + /// replace the current one with the better one. + pub fn update_host_if_needed<'a>(&mut self, mut addrs: impl Iterator) { + fn is_local(ip: impl Into) -> bool { + match ip.into() { + IpAddr::V4(ip) => ip.is_loopback() || ip.is_private(), + IpAddr::V6(ip) => ip.is_loopback(), + } + } + + // if current dial opts is not good enough + let update = match &self.host { + Host::Domain(_) => false, + Host::Ipv4(ip) => is_local(*ip), + Host::Ipv6(ip) => is_local(*ip), + }; + if update { + // if new options is better + let new = addrs.find_map(|x| { + x.iter().find_map(|x| match x { + Protocol::Dns4(hostname) | Protocol::Dns6(hostname) => { + Some(Host::Domain(hostname.into_owned())) + } + Protocol::Ip4(ip) if !is_local(ip) => Some(Host::Ipv4(ip)), + Protocol::Ip6(ip) if !is_local(ip) => Some(Host::Ipv6(ip)), + _ => None, + }) + }); + if let Some(new) = new { + self.host = new; + } + } + } +} + pub(crate) mod libp2p_opts { use std::net::{IpAddr, SocketAddr}; diff --git a/p2p/src/identify/p2p_identify_reducer.rs b/p2p/src/identify/p2p_identify_reducer.rs index d0a5c1f0d4..0b887f2268 100644 --- a/p2p/src/identify/p2p_identify_reducer.rs +++ b/p2p/src/identify/p2p_identify_reducer.rs @@ -2,6 +2,7 @@ use openmina_core::{bug_condition, Substate}; use redux::ActionWithMeta; use crate::{ + connection::outgoing::P2pConnectionOutgoingInitOpts, disconnection::{P2pDisconnectionAction, P2pDisconnectionReason}, token::{BroadcastAlgorithm, DiscoveryAlgorithm, IdentifyAlgorithm, RpcAlgorithm, StreamKind}, P2pNetworkConnectionMuxState, P2pNetworkKadRequestAction, P2pNetworkKadState, @@ -60,6 +61,9 @@ impl P2pState { let info = *info; if let Some(peer) = p2p_state.peers.get_mut(&peer_id) { peer.identify = Some(info.clone()); + if let Some(P2pConnectionOutgoingInitOpts::LibP2P(opts)) = &mut peer.dial_opts { + opts.update_host_if_needed(info.listen_addrs.iter()); + } } else { bug_condition!( "Peer state not found for `P2pIdentifyAction::UpdatePeerInformation`" From 63d6e531a500ed5065d7157be18f9898723801a4 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:46:49 +0200 Subject: [PATCH 016/175] Frontend - Caching for Webnode (#865) --- frontend/docker/startup.sh | 33 +++++++++++++++++++--- frontend/httpd.conf | 25 ++++++++++++++++ frontend/package.json | 5 ++-- frontend/scripts/update-webnode-version.js | 21 ++++++++++++++ frontend/src/index.html | 10 +++++-- 5 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 frontend/scripts/update-webnode-version.js diff --git a/frontend/docker/startup.sh b/frontend/docker/startup.sh index f92157a6d1..98378a56fc 100644 --- a/frontend/docker/startup.sh +++ b/frontend/docker/startup.sh @@ -79,15 +79,15 @@ download_wasm_files() { echo "Error: OPENMINA_WASM_VERSION is not set. Exiting." exit 1 fi - + WASM_URL="$OPENMINA_BASE_URL/openmina/releases/download/$OPENMINA_WASM_VERSION/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz" TARGET_DIR="/usr/local/apache2/htdocs/assets/webnode/pkg" - + mkdir -p "$TARGET_DIR" echo "Downloading WASM files from $WASM_URL..." curl -s -L --retry 3 --retry-delay 5 -o "/tmp/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz" "$WASM_URL" - + if [[ $? -ne 0 ]]; then echo "Failed to download the WASM file after 3 attempts, exiting." exit 1 @@ -95,19 +95,44 @@ download_wasm_files() { echo "WASM file downloaded successfully. Extracting to $TARGET_DIR..." tar -xzf "/tmp/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz" -C "$TARGET_DIR" - + # Check if the extraction was successful if [[ $? -ne 0 ]]; then echo "Failed to extract the WASM file, exiting." exit 1 else echo "WASM files extracted successfully to $TARGET_DIR" + + # Inject caching logic into openmina_node_web.js + OPENMINA_JS="$TARGET_DIR/openmina_node_web.js" + inject_caching_logic "$OPENMINA_JS" fi fi rm "/tmp/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz" } +inject_caching_logic() { + local js_file="$1" + if [ -f "$js_file" ]; then + echo "Injecting caching logic into $js_file" + + # Generate a unique hash + local hash=$(openssl rand -hex 8) + + sed -i "/module_or_path = fetch(module_or_path);/i\ module_or_path += \"\?v=${hash}\";" "$js_file" + sed -i 's/module_or_path = fetch(module_or_path);/module_or_path = fetch(module_or_path, { cache: "force-cache", headers: { "Cache-Control": "max-age=31536000, immutable" } });/' "$js_file" + if [[ $? -ne 0 ]]; then + echo "Failed to inject caching logic into $js_file" + else + echo "Successfully injected caching logic into $js_file" + fi + else + echo "Warning: $js_file not found. Caching logic not injected." + fi +} + + if [ -n "$OPENMINA_FRONTEND_ENVIRONMENT" ]; then echo "Using environment: $OPENMINA_FRONTEND_ENVIRONMENT" cp -f /usr/local/apache2/htdocs/assets/environments/"$OPENMINA_FRONTEND_ENVIRONMENT".js \ diff --git a/frontend/httpd.conf b/frontend/httpd.conf index f82a328e46..e6c0570e75 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -228,6 +228,31 @@ SSLProxyEngine On + +# Define development environments +SetEnvIf Host "localhost|127.0.0.1" DEVELOPMENT + +# Cache rules for WebNode assets + + # Development environment - no cache + Header set Cache-Control "no-store, no-cache, must-revalidate" env=DEVELOPMENT + + # Production environment - aggressive caching + Header set Cache-Control "public, max-age=31536000, immutable" env=!DEVELOPMENT + + + # Development environment - no cache + Header set Cache-Control "no-store, no-cache, must-revalidate" env=DEVELOPMENT + + # Production environment - aggressive caching + Header set Cache-Control "public, max-age=31536000, immutable" env=!DEVELOPMENT + + +# Make sure mod_headers is enabled + + LoadModule headers_module modules/mod_headers.so + + # # If you wish httpd to run as a different user or group, you must run # httpd as root initially and it will switch. diff --git a/frontend/package.json b/frontend/package.json index 925c2379d1..c9f5218f60 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,11 +6,12 @@ "start": "npm install && ng serve --configuration local --open", "start:dev": "ng serve --configuration development", "build": "ng build", - "build:prod": "ng build --configuration production", + "build:prod": "npm run prebuild && ng build --configuration production", "tests": "npx cypress open --config baseUrl=http://localhost:4200", "tests:headless": "npx cypress run --headless --config baseUrl=http://localhost:4200", "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t openmina/frontend:latest . && docker push openmina/frontend:latest", - "start:bundle": "npx http-server dist/frontend -p 4200" + "start:bundle": "npx http-server dist/frontend -p 4200", + "prebuild": "node scripts/update-webnode-version.js" }, "private": true, "dependencies": { diff --git a/frontend/scripts/update-webnode-version.js b/frontend/scripts/update-webnode-version.js new file mode 100644 index 0000000000..8e18ab29dc --- /dev/null +++ b/frontend/scripts/update-webnode-version.js @@ -0,0 +1,21 @@ +const fs = require('fs'); +const crypto = require('crypto'); + +// Generate a random hash +const hash = crypto.randomBytes(16).toString('hex'); // Generates a 32-character random hex string + +// Read and update index.html +const indexPath = './src/index.html'; +let indexHtml = fs.readFileSync(indexPath, 'utf8'); + +// Enhanced Regex Pattern +// Match 'const WEBNODE_VERSION = ' with optional whitespace around the equals and between quotes +const versionRegex = /const\s+WEBNODE_VERSION\s*=\s*['"][^'"]*['"];/; + +// Perform replacement +indexHtml = indexHtml.replace(versionRegex, `const WEBNODE_VERSION = '${hash}';`); + +// Write updated content to index.html +fs.writeFileSync(indexPath, indexHtml); + +console.log(`Updated WEBNODE_VERSION in ${indexPath} to ${hash}`); diff --git a/frontend/src/index.html b/frontend/src/index.html index 0ae6d07c19..b6768d9bf3 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -42,11 +42,15 @@ From 6a95fbae73b66fdba08922db373f704580677563 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Wed, 6 Nov 2024 09:45:31 +0200 Subject: [PATCH 022/175] Frontend - Improve web node loading (#873) --- .idea/vcs.xml | 1 + frontend/package.json | 1 + .../web-node-demo-dashboard.component.html | 8 ++++---- .../web-node-demo-dashboard.component.scss | 13 ++++++------ .../web-node-demo-dashboard.component.ts | 20 +++++++++++-------- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1ddfbb..c4f6642370 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index 7ade4400c2..11a9fc103a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -5,6 +5,7 @@ "install:deps": "npm install", "start": "npm install && ng serve --configuration local --open", "start:dev": "ng serve --configuration development", + "start:dev:mobile": "ng serve --configuration development --host 0.0.0.0", "build": "ng build", "build:prod": "ng build --configuration production", "tests": "npx cypress open --config baseUrl=http://localhost:4200", diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html index fffd2a9436..0dd03375e7 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html @@ -1,11 +1,11 @@
-
-
+
+
Produce blocks, -  right in your browser + right in your browser
@@ -21,7 +21,7 @@
-
+
@for (item of loading; track $index) { diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss index 0fb76960f3..574f231162 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss @@ -17,10 +17,9 @@ $white: #000000; .data-wrapper { height: calc(100% - 56px - 72px); max-width: 568px; + padding: 10vw 0; .header { - margin-bottom: 56px; - .loading-webnode { font-size: 24px; line-height: 32px; @@ -40,8 +39,10 @@ $white: #000000; } .progress { - height: 380px; - margin: 64px 0; + min-height: 380px; + @media (max-width: 768px) { + min-height: 36vh; + } } } @@ -80,9 +81,9 @@ $white: #000000; } } -@media (max-width: 768px) { +@media (max-width: 568px) { .font-16 { - font-size: 15px; + font-size: 14px; } .loading-webnode span { display: block; diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts index 4d74dc10ac..30f82835d8 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { untilDestroyed } from '@ngneat/until-destroy'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { WebNodeService } from '@core/services/web-node.service'; @@ -6,7 +6,7 @@ import { GlobalErrorHandlerService } from '@openmina/shared'; import { NgClass, NgForOf, NgIf, NgOptimizedImage } from '@angular/common'; import { Router } from '@angular/router'; import { getFirstFeature } from '@shared/constants/config'; -import { trigger, state, style, transition, animate } from '@angular/animations'; +import { animate, state, style, transition, trigger } from '@angular/animations'; import { filter, switchMap, timer } from 'rxjs'; import { LoadingSpinnerComponent } from '@shared/loading-spinner/loading-spinner.component'; import { FileProgressHelper } from '@core/helpers/file-progress.helper'; @@ -53,7 +53,7 @@ export interface WebNodeLoadingStep { ]), ], }) -export class WebNodeDemoDashboardComponent extends StoreDispatcher implements OnInit { +export class WebNodeDemoDashboardComponent extends StoreDispatcher implements OnInit, AfterViewInit { protected readonly WebNodeStepStatus = WebNodeStepStatus; readonly loading: WebNodeLoadingStep[] = [ @@ -87,6 +87,9 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On this.listenToErrorIssuing(); this.checkWebNodeProgress(); this.fetchPeersInformation(); + } + + ngAfterViewInit(): void { this.buildProgressBar(); } @@ -196,10 +199,10 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On downloaded: (progress.downloaded / 1e6).toFixed(1), total: (progress.totalSize / 1e6).toFixed(1), }; - // this step is only 1 out of 3. But it counts as 80% of the 100% progress. - // So we need to calculate the total progress based on the current step. - const totalProgress = (progress.progress * this.stepsPercentages[0]) / 100; - this.updateProgressBar(totalProgress); + if (this.svg) { + const totalProgress = (progress.progress * this.stepsPercentages[0]) / 100; + this.updateProgressBar(totalProgress); + } this.detect(); }); } @@ -259,7 +262,8 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On this.progressBar.append('text') .attr('text-anchor', 'middle') - .attr('dominant-baseline', 'middle') + .attr('alignment-baseline', 'central') + .attr('dominant-baseline', 'central') .attr('font-size', '40px') .attr('fill', 'var(--base-primary)') .attr('opacity', 0.8) From 83f1df5b0a949a4397bc20cedcdf9705c122393e Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:06:32 +0200 Subject: [PATCH 023/175] Frontend - Web Node Loading Screen Improvements (#874) --- frontend/src/app/app.module.ts | 1 + .../src/app/core/services/web-node.service.ts | 43 +++++---- .../web-node-demo-dashboard.component.html | 85 +++++++---------- .../web-node-demo-dashboard.component.scss | 59 +++++++----- .../web-node-demo-dashboard.component.ts | 95 ++++++++++++------- frontend/src/index.html | 25 ++--- 6 files changed, 170 insertions(+), 138 deletions(-) diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index e63bed102f..c04c0ff09e 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -44,6 +44,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { constructor(private errorHandlerService: GlobalErrorHandlerService) {} handleError(error: any): void { + console.log(123123123); Sentry.captureException(error); this.errorHandlerService.handleError(error); console.error(error); diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index b53ae44d16..8763276c60 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -1,5 +1,18 @@ import { Inject, Injectable } from '@angular/core'; -import { BehaviorSubject, catchError, filter, from, fromEvent, map, merge, Observable, of, switchMap, tap } from 'rxjs'; +import { + BehaviorSubject, + catchError, + EMPTY, + filter, + from, + fromEvent, + map, + merge, + Observable, + of, + switchMap, + tap, +} from 'rxjs'; import base from 'base-x'; import { any } from '@openmina/shared'; import { HttpClient } from '@angular/common/http'; @@ -55,8 +68,8 @@ export class WebNodeService { } loadWasm$(): Observable { - this.loadWebnodeJs(); - sendSentryEvent('Loading WebNode JS'); + this.webNodeStartTime = Date.now(); + // this.loadWebnodeJs(); return merge( of(any(window).webnode).pipe(filter(Boolean)), fromEvent(window, 'webNodeLoaded'), @@ -64,7 +77,6 @@ export class WebNodeService { switchMap(() => this.http.get<{ publicKey: string, privateKey: string }>('assets/webnode/web-node-secrets.json')), tap(data => { this.webNodeKeyPair = data; - sendSentryEvent('WebNode JS Loaded. Loading WebNode Wasm'); }), map(() => void 0), ); @@ -75,19 +87,16 @@ export class WebNodeService { .pipe( switchMap((wasm: any) => from(wasm.default('assets/webnode/pkg/openmina_node_web_bg.wasm')).pipe(map(() => wasm))), switchMap((wasm) => { - sendSentryEvent('WebNode Wasm loaded. Starting WebNode'); this.webnodeProgress$.next('Loaded'); return from(wasm.run(this.webNodeKeyPair.privateKey)); }), tap((webnode: any) => { - sendSentryEvent('WebNode Started'); - this.webNodeStartTime = Date.now(); (window as any)['webnode'] = webnode; this.webnode$.next(webnode); this.webnodeProgress$.next('Started'); }), catchError((error) => { - sendSentryEvent('WebNode failed to start'); + sendSentryEvent('WebNode failed to start: ' + error.message); console.error(error); return of(null); }), @@ -115,18 +124,16 @@ export class WebNodeService { filter(Boolean), switchMap(handle => from(any(handle).state().peers())), tap((peers) => { - if (!this.sentryEvents.sentNoPeersEvent && Date.now() - this.webNodeStartTime >= 5000 && peers.length === 0) { - sendSentryEvent('WebNode has no peers after 5 seconds from startup.'); - this.sentryEvents.sentNoPeersEvent = true; - } - if (!this.sentryEvents.sentPeersEvent && peers.length > 0) { - const seconds = (Date.now() - this.webNodeStartTime) / 1000; - sendSentryEvent(`WebNode found its first peer after ${seconds}s`); - this.sentryEvents.sentPeersEvent = true; - } + // if (!this.sentryEvents.sentNoPeersEvent && Date.now() - this.webNodeStartTime >= 5000 && peers.length === 0) { + // sendSentryEvent('WebNode has no peers after 5 seconds from startup.'); + // this.sentryEvents.sentNoPeersEvent = true; + // } + // if (!this.sentryEvents.sentPeersEvent && peers.length > 0) { + // this.sentryEvents.sentPeersEvent = true; + // } if (!this.sentryEvents.firstPeerConnected && peers.some((p: any) => p.connection_status === DashboardPeerStatus.CONNECTED)) { const seconds = (Date.now() - this.webNodeStartTime) / 1000; - sendSentryEvent(`WebNode connected to its first peer after ${seconds}s`); + sendSentryEvent(`WebNode connected in ${seconds.toFixed(1)}s`); this.sentryEvents.firstPeerConnected = true; this.webnodeProgress$.next('Connected'); } diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html index 0dd03375e7..4bdfc683d5 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html @@ -1,74 +1,61 @@
-
-
-
- Produce blocks, - right in your browser -
+
+
+
+
+ Produce blocks, + right in your browser +
-
- @if (!loading[loading.length - 1].loaded) { - @if (loading[0].status === WebNodeStepStatus.LOADING) { - Downloading... - } @else { - ~7 seconds left - } - } @else { - Web Node is ready - } +
{{ loadingMessage }}
-
-
+
-
- @for (item of loading; track $index) { -
- @if (item.status === WebNodeStepStatus.LOADING) { - - } @else { - check_circle - } -
{{ item.name }} -
- @if (item.data) { - @if (item.data.total) { - {{ item.data.downloaded }} of {{ item.data.total }} MB +
+ @for (item of loading; track $index) { +
+ @if (item.status === WebNodeStepStatus.LOADING) { + } @else { - {{ item.data.est }} + check_circle } - } -
- } +
{{ item.name }} +
+
+ } +
@if (!loading[loading.length - 1].loaded && errors.length) { -
-
-
It appears there are some errors.
-
-
- @for (error of errors; track $index) { -
{{ error }}
- } +
+
+
+
It appears there are some errors.
+
+
+ @for (error of errors; track $index) { +
{{ error }}
+ } +
}
-
+
lightbulb
You can run the Web Node from your phone
- diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss index 574f231162..aa5a2c9601 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss @@ -12,36 +12,42 @@ $white: #000000; .logo-header { height: 56px; + + img { + opacity: 0.5; + } } .data-wrapper { height: calc(100% - 56px - 72px); - max-width: 568px; - padding: 10vw 0; - .header { - .loading-webnode { - font-size: 24px; - line-height: 32px; + .loading-content { + max-width: 568px; + + .header { + .loading-webnode { + font-size: 20px; + line-height: 30px; + } } - } - mina-loading-spinner { - margin: 0 2px; - } + mina-loading-spinner { + margin: 0 2px; + } - .mina-icon.circle-check { - font-variation-settings: 'FILL' 1, 'wght' 300 !important; - } + .mina-icon.circle-check { + font-variation-settings: 'FILL' 1, 'wght' 300 !important; + } - .mina-icon.aware-primary { - animation: fadeIn 1500ms ease-in-out infinite; - } + .mina-icon.aware-primary { + animation: fadeIn 1500ms ease-in-out infinite; + } - .progress { - min-height: 380px; - @media (max-width: 768px) { - min-height: 36vh; + .progress { + min-height: 256px; + @media (max-width: 768px) { + min-height: 30vh; + } } } } @@ -54,6 +60,7 @@ $white: #000000; width: 158px; height: 48px !important; background-color: $cta-container; + color: $base-background; &.disabled { opacity: 0.25; @@ -64,6 +71,15 @@ $white: #000000; background-color: $selected-primary; } } + + @media (max-width: 768px) { + > div { + display: none; + } + button { + width: 100%; + } + } } @keyframes fadeIn { @@ -82,9 +98,6 @@ $white: #000000; } @media (max-width: 568px) { - .font-16 { - font-size: 14px; - } .loading-webnode span { display: block; } diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts index 30f82835d8..6e896677a8 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts @@ -2,7 +2,7 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, OnInit, import { untilDestroyed } from '@ngneat/until-destroy'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { WebNodeService } from '@core/services/web-node.service'; -import { GlobalErrorHandlerService } from '@openmina/shared'; +import { any, GlobalErrorHandlerService } from '@openmina/shared'; import { NgClass, NgForOf, NgIf, NgOptimizedImage } from '@angular/common'; import { Router } from '@angular/router'; import { getFirstFeature } from '@shared/constants/config'; @@ -22,10 +22,6 @@ export interface WebNodeLoadingStep { name: string; loaded: boolean; status: WebNodeStepStatus; - data: { - downloaded: string; - total: string; - } | any; } @@ -57,19 +53,15 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On protected readonly WebNodeStepStatus = WebNodeStepStatus; readonly loading: WebNodeLoadingStep[] = [ - { name: 'Setting up browser for Web Node', loaded: false, status: WebNodeStepStatus.LOADING, data: null }, - { name: 'Getting ready to produce blocks', loaded: false, status: WebNodeStepStatus.PENDING, data: { est: '~5s' } }, - { - name: 'Connecting directly to Mina network', - loaded: false, - status: WebNodeStepStatus.PENDING, - data: { est: '~2s' }, - }, + { name: 'Setting up browser for Web Node', loaded: false, status: WebNodeStepStatus.LOADING }, + { name: 'Getting ready to produce blocks', loaded: false, status: WebNodeStepStatus.PENDING }, + { name: 'Connecting directly to Mina network', loaded: false, status: WebNodeStepStatus.PENDING }, ]; + loadingMessage: string = ''; ready: boolean = false; errors: string[] = []; - private stepsPercentages = this.stepPercentages; + private stepsPercentages: number[]; private secondStepInterval: any; private thirdStepInterval: any; private progress: number = 0; @@ -83,6 +75,8 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On private router: Router) { super(); } ngOnInit(): void { + any(window).testtest = []; + this.stepsPercentages = this.getStepPercentages(); this.fetchProgress(); this.listenToErrorIssuing(); this.checkWebNodeProgress(); @@ -96,18 +90,19 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On private checkWebNodeProgress(): void { this.webNodeService.webnodeProgress$.pipe(untilDestroyed(this)).subscribe((state: string) => { if (state === 'Loaded') { + this.loadingMessage = '~5 seconds left'; this.loading[0].loaded = true; this.loading[0].status = WebNodeStepStatus.DONE; this.loading[1].status = WebNodeStepStatus.LOADING; this.advanceProgressFor2ndStep(); } else if (state === 'Started') { + this.loadingMessage = '~2 seconds left'; clearInterval(this.secondStepInterval); this.loading[0].loaded = true; this.loading[1].loaded = true; this.loading[0].status = WebNodeStepStatus.DONE; this.loading[1].status = WebNodeStepStatus.DONE; this.loading[2].status = WebNodeStepStatus.LOADING; - this.updateProgressBar(this.stepsPercentages[0] + this.stepsPercentages[1]); this.advanceProgressFor3rdStep(); } else if (state === 'Connected') { clearInterval(this.thirdStepInterval); @@ -117,12 +112,11 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On this.loading.forEach((step: WebNodeLoadingStep) => step.loaded = true); this.goToEndProgress(); } - this.ready = this.loading.every((step: WebNodeLoadingStep) => step.loaded); this.detect(); }); } - private get stepPercentages(): number[] { + private getStepPercentages(): number[] { // random between 65 and 80 const first = Math.floor(Math.random() * 15) + 65; // random between 15 and 17 @@ -145,11 +139,23 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On }, 75); } - private advanceProgressFor3rdStep(): void { + private async advanceProgressFor3rdStep(): Promise { // second step is done, now we are working on the third step. // each second add 1% to the progress. // but the third step is only 10% of the total progress. // so never go above 10%. Stop at 9% if the third step is not done yet. + + const currentProgress = this.progress; + const targetProgress = this.stepsPercentages[0] + this.stepsPercentages[1] - 1; + // run fast 5 increments to reach the target progress + const diff = targetProgress - currentProgress; + + for (let i = 0; i < diff; i++) { + await new Promise(resolve => setTimeout(resolve, 25)); + this.updateProgressBar(currentProgress + i); + this.detect(); + } + let progress = 0; this.thirdStepInterval = setInterval(() => { if (progress < this.stepsPercentages[2] - 1) { @@ -166,13 +172,13 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On let progress = this.progress; let interval = setInterval(() => { - if (progress < 100) { + if (progress <= 100) { progress += 1; this.updateProgressBar(progress); } else { clearInterval(interval); } - }, 10); + }, 30); } private fetchPeersInformation(): void { @@ -186,7 +192,8 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On this.errorHandler.errors$ .pipe(untilDestroyed(this)) .subscribe((error: string) => { - console.log(error); + this.errors.push(error); + this.detect(); }); } @@ -195,10 +202,7 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On filter(Boolean), untilDestroyed(this), ).subscribe((progress) => { - this.loading[0].data = { - downloaded: (progress.downloaded / 1e6).toFixed(1), - total: (progress.totalSize / 1e6).toFixed(1), - }; + this.loadingMessage = `Downloading ${(progress.downloaded / 1e6).toFixed(1)} of ${(progress.totalSize / 1e6).toFixed(1)} MB`; if (this.svg) { const totalProgress = (progress.progress * this.stepsPercentages[0]) / 100; this.updateProgressBar(totalProgress); @@ -217,7 +221,7 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On private buildProgressBar(): void { const width = this.chartContainer.nativeElement.offsetWidth; const height = this.chartContainer.nativeElement.offsetHeight; - const barWidth = 12; + const barWidth = 4; const progress = 0; this.svg = d3 @@ -230,6 +234,13 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On .attr('transform', `translate(${width / 2}, ${height / 2})`); const radius = Math.min(width, height) / 2 - barWidth; + + this.progressBar.append('circle') + .attr('r', radius) + .attr('fill', 'none') + .attr('stroke', 'var(--base-tertiary2)') + .attr('stroke-width', 1); + this.arc = d3.arc() .innerRadius(radius - barWidth) .outerRadius(radius) @@ -245,10 +256,9 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On const gradient = defs.append('linearGradient') .attr('id', 'progress-gradient') .attr('x1', '0%') - .attr('x2', '100%') - .attr('y1', '0%') - .attr('y2', '0%') - .attr('gradientTransform', 'rotate(45)'); + .attr('x2', '75%') + .attr('y1', '25%') + .attr('y2', '0%'); gradient.append('stop') .attr('offset', '8%') @@ -267,12 +277,27 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On .attr('font-size', '40px') .attr('fill', 'var(--base-primary)') .attr('opacity', 0.8) - .text(`${(progress).toFixed(0)}%`); + .attr('dx', '-.2em') + .text((progress).toFixed(0)); + this.progressBar.append('text') + .attr('class', 'symbol') + .attr('text-anchor', 'middle') + .attr('alignment-baseline', 'central') + .attr('dominant-baseline', 'central') + .attr('font-size', '20px') + .attr('fill', 'var(--base-tertiary)') + .attr('opacity', 0.8) + .attr('dy', '-.3em') + .attr('dx', '1.5em') + .text('%'); } private updateProgressBar(newProgress: number): void { - if (newProgress > 100) { + any(window).testtest.push(newProgress); + if (newProgress >= 100) { + this.ready = true; newProgress = 100; + this.detect(); } this.progress = newProgress; this.arc.endAngle(Math.PI * 2 * (newProgress / 100)); @@ -281,6 +306,10 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On .attr('d', this.arc); this.progressBar .select('text') - .text(`${(newProgress).toFixed(0)}%`); + .text((newProgress).toFixed(0)); + const numberOfDigits = newProgress.toFixed(0).length + 1; + this.progressBar.select('.symbol') + .attr('dx', `${numberOfDigits * 0.45}em`) + .text('%'); } } diff --git a/frontend/src/index.html b/frontend/src/index.html index a722068238..0344746345 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -42,21 +42,16 @@ From 265237dffb32d8d22f070eadf1bad8ab7de2f30b Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Wed, 6 Nov 2024 19:23:29 +0400 Subject: [PATCH 024/175] fix(p2p/webrtc): not waiting for channel open, before sending auth message --- p2p/src/service_impl/webrtc/mod.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/p2p/src/service_impl/webrtc/mod.rs b/p2p/src/service_impl/webrtc/mod.rs index 0fd03da2f9..f05aa97143 100644 --- a/p2p/src/service_impl/webrtc/mod.rs +++ b/p2p/src/service_impl/webrtc/mod.rs @@ -250,6 +250,15 @@ async fn peer_start(args: PeerAddArgs) { } }; + let (main_channel_open_tx, main_channel_open) = oneshot::channel::<()>(); + let mut main_channel_open_tx = Some(main_channel_open_tx); + main_channel.on_open(move || { + if let Some(tx) = main_channel_open_tx.take() { + let _ = tx.send(()); + } + std::future::ready(()) + }); + let answer = if is_outgoing { let answer_fut = async { let sdp = pc.local_sdp().await.unwrap(); @@ -357,6 +366,8 @@ async fn peer_start(args: PeerAddArgs) { return; } Some(PeerCmd::ConnectionAuthorizationSend(Some(auth))) => { + let _ = main_channel_open.await; + // Add a delay for sending messages after channel // was opened. Some initial messages get lost otherwise. // TODO(binier): find deeper cause and fix it. From b5933e11ea2a53b59799b38dd1bbb96c15c744b0 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Wed, 6 Nov 2024 19:24:48 +0400 Subject: [PATCH 025/175] fix(p2p/webrtc): peer connection not interrupted when state machine requests disconnection of the peer --- p2p/src/service_impl/webrtc/mod.rs | 49 +++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/p2p/src/service_impl/webrtc/mod.rs b/p2p/src/service_impl/webrtc/mod.rs index f05aa97143..c363f39b6b 100644 --- a/p2p/src/service_impl/webrtc/mod.rs +++ b/p2p/src/service_impl/webrtc/mod.rs @@ -42,7 +42,10 @@ use super::TaskSpawner; const CHUNK_SIZE: usize = 16 * 1024; pub enum Cmd { - PeerAdd(PeerAddArgs), + PeerAdd { + args: PeerAddArgs, + abort: oneshot::Receiver<()>, + }, } #[derive(Debug)] @@ -83,6 +86,7 @@ pub enum PeerConnectionKind { pub struct PeerState { pub cmd_sender: mpsc::UnboundedSender, + pub abort: oneshot::Sender<()>, } #[derive(thiserror::Error, derive_more::From, Debug)] @@ -702,8 +706,13 @@ pub trait P2pServiceWebrtc: redux::Service { spawner.spawn_main("webrtc", async move { while let Some(cmd) = cmd_receiver.recv().await { match cmd { - Cmd::PeerAdd(args) => { - spawn_local(peer_start(args)); + Cmd::PeerAdd { args, abort } => { + spawn_local(async move { + tokio::select! { + _ = abort => {} + _ = peer_start(args) => {} + } + }); } } } @@ -717,42 +726,52 @@ pub trait P2pServiceWebrtc: redux::Service { fn outgoing_init(&mut self, peer_id: PeerId) { let (peer_cmd_sender, peer_cmd_receiver) = mpsc::unbounded_channel(); + let (abort_sender, abort_receiver) = oneshot::channel(); self.peers().insert( peer_id, PeerState { cmd_sender: peer_cmd_sender, + abort: abort_sender, }, ); let event_sender = self.event_sender().clone(); let event_sender = Arc::new(move |p2p_event: P2pEvent| event_sender.send(p2p_event.into()).ok()); - let _ = self.cmd_sender().send(Cmd::PeerAdd(PeerAddArgs { - peer_id, - kind: PeerConnectionKind::Outgoing, - event_sender, - cmd_receiver: peer_cmd_receiver, - })); + let _ = self.cmd_sender().send(Cmd::PeerAdd { + args: PeerAddArgs { + peer_id, + kind: PeerConnectionKind::Outgoing, + event_sender, + cmd_receiver: peer_cmd_receiver, + }, + abort: abort_receiver, + }); } fn incoming_init(&mut self, peer_id: PeerId, offer: webrtc::Offer) { let (peer_cmd_sender, peer_cmd_receiver) = mpsc::unbounded_channel(); + let (abort_sender, abort_receiver) = oneshot::channel(); self.peers().insert( peer_id, PeerState { cmd_sender: peer_cmd_sender, + abort: abort_sender, }, ); let event_sender = self.event_sender().clone(); let event_sender = Arc::new(move |p2p_event: P2pEvent| event_sender.send(p2p_event.into()).ok()); - let _ = self.cmd_sender().send(Cmd::PeerAdd(PeerAddArgs { - peer_id, - kind: PeerConnectionKind::Incoming(Box::new(offer)), - event_sender, - cmd_receiver: peer_cmd_receiver, - })); + let _ = self.cmd_sender().send(Cmd::PeerAdd { + args: PeerAddArgs { + peer_id, + kind: PeerConnectionKind::Incoming(Box::new(offer)), + event_sender, + cmd_receiver: peer_cmd_receiver, + }, + abort: abort_receiver, + }); } fn set_answer(&mut self, peer_id: PeerId, answer: webrtc::Answer) { From 3b99cd24441407cb922ffcd3db2abb188c9fa95b Mon Sep 17 00:00:00 2001 From: Adrian Nagy Date: Fri, 13 Sep 2024 12:30:58 +0200 Subject: [PATCH 026/175] feat: enable more powerfull clippy lints --- Cargo.toml | 5 +++++ clippy.toml | 1 + node/Cargo.toml | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 clippy.toml diff --git a/Cargo.toml b/Cargo.toml index 17198539e4..678545e435 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,11 @@ members = [ resolver = "2" +[workspace.lints.clippy] +unwrap_used = "warn" +arithmetic_side_effects = "warn" +indexing_slicing = "warn" + [workspace.dependencies] mina-p2p-messages = { path = "mina-p2p-messages" } ledger = { path = "ledger", package = "mina-tree" } diff --git a/clippy.toml b/clippy.toml new file mode 100644 index 0000000000..c592911cd6 --- /dev/null +++ b/clippy.toml @@ -0,0 +1 @@ +allow-unwrap-in-tests=true \ No newline at end of file diff --git a/node/Cargo.toml b/node/Cargo.toml index e969552580..99ec0ed539 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -4,6 +4,9 @@ version = "0.11.0" edition = "2021" license = "Apache-2.0" +[lints] +workspace = true + [dependencies] rand = "0.8.0" serde = "1.0.147" From af23b4a0715a1a311c46c11afa29d1fa31ec1795 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Thu, 7 Nov 2024 18:36:27 +0100 Subject: [PATCH 027/175] Fix `CheckedSigned::on_if` behavior when `sgn` is a constant Make `CheckedSigned.sgn` a cvar to properly push it to the witness vector Use `CheckedSigned::on_if` everywhere, instead of manually `match` it (which was incorrect) --- ledger/src/proofs/block.rs | 13 +++-- ledger/src/proofs/numbers/currency.rs | 49 +++++++++++------- ledger/src/proofs/to_field_elements.rs | 17 ++++--- ledger/src/proofs/transaction.rs | 69 ++++++++++++++++---------- ledger/src/proofs/zkapp.rs | 4 +- ledger/src/zkapps/intefaces.rs | 10 ++-- ledger/src/zkapps/non_snark.rs | 10 ++-- ledger/src/zkapps/snark.rs | 35 ++++++++----- ledger/src/zkapps/zkapp_logic.rs | 4 +- 9 files changed, 126 insertions(+), 85 deletions(-) diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs index e79d93e942..4fe40a73ca 100644 --- a/ledger/src/proofs/block.rs +++ b/ledger/src/proofs/block.rs @@ -35,6 +35,7 @@ use crate::{ transaction_logic::protocol_state::{EpochLedger, ProtocolStateView}, }, staged_ledger::hash::StagedLedgerHash, + zkapps::intefaces::{SignedAmountBranchParam, SignedAmountInterface}, Inputs, ToInputs, }; @@ -1637,10 +1638,14 @@ fn block_main<'a>( txn_statement_ledger_hashes_equal(s1, &s2, w) }; - let supply_increase = w.exists_no_check(match txn_stmt_ledger_hashes_didn_t_change { - Boolean::True => CheckedSigned::const_zero(), - Boolean::False => txn_snark.supply_increase.to_checked(), - }); + let supply_increase = CheckedSigned::on_if( + txn_stmt_ledger_hashes_didn_t_change.var(), + SignedAmountBranchParam { + on_true: &CheckedSigned::zero(), + on_false: &txn_snark.supply_increase.to_checked(), + }, + w, + ); let (updated_consensus_state, consensus_state) = consensus::next_state_checked( previous_state, diff --git a/ledger/src/proofs/numbers/currency.rs b/ledger/src/proofs/numbers/currency.rs index e6a0e052df..5d48df544a 100644 --- a/ledger/src/proofs/numbers/currency.rs +++ b/ledger/src/proofs/numbers/currency.rs @@ -1,4 +1,7 @@ -use crate::scan_state::currency::{self, Amount, Balance, Fee, Magnitude, MinMax, Sgn, Signed}; +use crate::{ + proofs::field::CircuitVar, + scan_state::currency::{self, Amount, Balance, Fee, Magnitude, MinMax, Sgn, Signed}, +}; use std::{cell::Cell, cmp::Ordering::Less}; use crate::proofs::{ @@ -42,7 +45,7 @@ where T: CheckedCurrency, { pub magnitude: T, - pub sgn: Sgn, + pub sgn: CircuitVar, pub value: Cell>, } @@ -65,7 +68,7 @@ where F: FieldWitness + std::fmt::Debug, T: CheckedCurrency + std::fmt::Debug, { - pub fn create(magnitude: T, sgn: Sgn, value: Option) -> Self { + pub fn create(magnitude: T, sgn: CircuitVar, value: Option) -> Self { Self { magnitude, sgn, @@ -77,40 +80,46 @@ where let value = magnitude.to_field(); Self { magnitude, - sgn: Sgn::Pos, + sgn: CircuitVar::Constant(Sgn::Pos), value: Cell::new(Some(value)), } } pub fn zero() -> Self { - Self::of_unsigned(T::zero()) + Self { + magnitude: T::zero(), + sgn: CircuitVar::Constant(Sgn::Pos), + value: Cell::new(None), + } } - pub fn const_zero() -> Self { + // https://github.com/MinaProtocol/mina/blob/ca9c8c86aa21d3c346d28ea0be7ad4cb0c22bf7f/src/lib/transaction_snark/transaction_snark.ml#L1891-L1892 + // https://github.com/MinaProtocol/mina/blob/ca9c8c86aa21d3c346d28ea0be7ad4cb0c22bf7f/src/lib/currency/currency.ml#L579 + pub fn constant_zero() -> Self { Self { magnitude: T::zero(), - sgn: Sgn::Pos, - value: Cell::new(None), + sgn: CircuitVar::Constant(Sgn::Pos), + value: Cell::new(Some(T::zero().to_field())), } } pub fn negate(self) -> Self { Self { magnitude: self.magnitude, - sgn: self.sgn.negate(), + sgn: self.sgn.map(|sgn| sgn.negate()), value: Cell::new(self.value.get().map(|f| f.neg())), } } pub fn is_neg(&self) -> Boolean { - match self.sgn { + match self.sgn.value() { Sgn::Pos => Boolean::False, Sgn::Neg => Boolean::True, } } pub fn is_pos(&self) -> Boolean { - match self.sgn { + match self.sgn.value() { Sgn::Pos => Boolean::True, Sgn::Neg => Boolean::False, } @@ -120,7 +129,7 @@ where match self.value.get() { Some(x) => x, None => { - let sgn: F = self.sgn.to_field(); + let sgn: F = self.sgn.value().to_field(); let magnitude: F = self.magnitude.to_field(); let value = w.exists_no_check(magnitude * sgn); self.value.replace(Some(value)); @@ -133,7 +142,7 @@ where match self.value.get() { Some(x) => x, None => { - let sgn: F = self.sgn.to_field(); + let sgn: F = self.sgn.value().to_field(); let magnitude: F = self.magnitude.to_field(); magnitude * sgn } @@ -144,7 +153,7 @@ where match self.value.get() { Some(_) => {} None => { - let sgn: F = self.sgn.to_field(); + let sgn: F = self.sgn.value().to_field(); let magnitude: F = self.magnitude.to_field(); self.value.replace(Some(magnitude * sgn)); } @@ -158,7 +167,7 @@ where fn unchecked(&self) -> currency::Signed { currency::Signed { magnitude: self.magnitude.to_inner(), - sgn: self.sgn, + sgn: *self.sgn.value(), } } @@ -193,7 +202,7 @@ where let res = Self { magnitude: res_magnitude, - sgn, + sgn: CircuitVar::Var(sgn), value: Cell::new(Some(res_value)), }; (res, overflow) @@ -219,7 +228,11 @@ where range_check::(magnitude, w); - Self::create(T::from_field(magnitude), sgn, Some(res_value)) + Self::create( + T::from_field(magnitude), + CircuitVar::Var(sgn), + Some(res_value), + ) } pub fn equal(&self, other: &Self, w: &mut Witness) -> Boolean { @@ -504,7 +517,7 @@ macro_rules! impl_currency { pub fn to_checked(&self) -> CheckedSigned> { CheckedSigned { magnitude: self.magnitude.to_checked(), - sgn: self.sgn, + sgn: CircuitVar::Var(self.sgn), value: Cell::new(None), } } diff --git a/ledger/src/proofs/to_field_elements.rs b/ledger/src/proofs/to_field_elements.rs index 6d081143aa..f35970fc36 100644 --- a/ledger/src/proofs/to_field_elements.rs +++ b/ledger/src/proofs/to_field_elements.rs @@ -32,7 +32,6 @@ use crate::{ use super::{ field::{Boolean, CircuitVar, FieldWitness, GroupAffine}, - numbers::currency::{CheckedCurrency, CheckedSigned}, step::PerProofWitness, transaction::{ field_to_bits, InnerCurve, PlonkVerificationKeyEvals, StepMainProofState, StepMainStatement, @@ -799,13 +798,6 @@ impl> ToFieldElements for &T { } } -impl> ToFieldElements for CheckedSigned { - fn to_field_elements(&self, fields: &mut Vec) { - self.sgn.to_field_elements(fields); - self.magnitude.to_field_elements(fields); - } -} - impl ToFieldElements for InnerCurve { fn to_field_elements(&self, fields: &mut Vec) { let GroupAffine:: { x, y, .. } = self.to_affine(); @@ -826,6 +818,15 @@ impl ToFieldElements for CircuitVar { } } +impl ToFieldElements for CircuitVar { + fn to_field_elements(&self, fields: &mut Vec) { + match self { + CircuitVar::Constant(_) => (), + CircuitVar::Var(var) => var.to_field_elements(fields), + } + } +} + impl ToFieldElements for StepMainStatement { fn to_field_elements(&self, fields: &mut Vec) { let Self { diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index 2ba60c89b4..1ed0020a03 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -2285,6 +2285,7 @@ pub mod transaction_snark { transaction_logic::{checked_cons_signed_command_payload, Coinbase}, }, sparse_ledger::SparseLedger, + zkapps::intefaces::{SignedAmountBranchParam, SignedAmountInterface}, AccountId, Inputs, PermissionTo, PermsConst, Timing, TimingAsRecordChecked, ToInputs, }; use ark_ff::Zero; @@ -3080,7 +3081,11 @@ pub mod transaction_snark { Boolean::True => Sgn::Neg, Boolean::False => Sgn::Pos, }; - CheckedSigned::create(CheckedAmount::of_fee(&fee), sgn, None) + CheckedSigned::create( + CheckedAmount::of_fee(&fee), + CircuitVar::Constant(sgn), + None, + ) }; let account_creation_fee = { @@ -3090,7 +3095,7 @@ pub mod transaction_snark { } else { CheckedAmount::zero() }; - CheckedSigned::create(magnitude, Sgn::Neg, None) + CheckedSigned::create(magnitude, CircuitVar::Constant(Sgn::Neg), None) }; new_account_fees = account_creation_fee.clone(); @@ -3113,7 +3118,7 @@ pub mod transaction_snark { let txn_global_slot = current_global_slot; let timing = { - let txn_amount = w.exists_no_check(match amount.sgn { + let txn_amount = w.exists_no_check(match amount.sgn.value() { Sgn::Neg => amount.magnitude, Sgn::Pos => CheckedAmount::zero(), }); @@ -3569,7 +3574,10 @@ pub mod transaction_snark { let (fee_transfer_excess, fee_transfer_excess_overflowed) = { let (magnitude, overflow) = payload.body.amount.to_checked().add_flagged(&amount_fee, w); - (CheckedSigned::create(magnitude, Sgn::Neg, None), overflow) + ( + CheckedSigned::create(magnitude, CircuitVar::Constant(Sgn::Neg), None), + overflow, + ) }; Boolean::assert_any( @@ -3577,37 +3585,48 @@ pub mod transaction_snark { w, ); - let value = match is_fee_transfer { - Boolean::True => fee_transfer_excess, - Boolean::False => user_command_excess, - }; - w.exists_no_check(value.magnitude); - value + CheckedSigned::on_if( + is_fee_transfer.var(), + SignedAmountBranchParam { + on_true: &fee_transfer_excess, + on_false: &user_command_excess, + }, + w, + ) }; - w.exists_no_check(match is_coinbase { - Boolean::True => then_value, - Boolean::False => else_value, - }) + CheckedSigned::on_if( + is_coinbase.var(), + SignedAmountBranchParam { + on_true: &then_value, + on_false: &else_value, + }, + w, + ) }; let supply_increase = { - let expected_supply_increase = match is_coinbase { - Boolean::True => CheckedSigned::of_unsigned(payload.body.amount.to_checked()), - Boolean::False => CheckedSigned::of_unsigned(CheckedAmount::zero()), - }; - w.exists_no_check(expected_supply_increase.magnitude); - w.exists_no_check(expected_supply_increase.magnitude); + let expected_supply_increase = CheckedSigned::on_if( + is_coinbase.var(), + SignedAmountBranchParam { + on_true: &CheckedSigned::of_unsigned(payload.body.amount.to_checked()), + on_false: &CheckedSigned::of_unsigned(CheckedAmount::zero()), + }, + w, + ); let (amt0, _overflow0) = expected_supply_increase .add_flagged(&CheckedSigned::of_unsigned(burned_tokens).negate(), w); - let new_account_fees_total = w.exists_no_check(match user_command_fails { - Boolean::True => zero_fee, - Boolean::False => new_account_fees, - }); + let new_account_fees_total = CheckedSigned::on_if( + user_command_fails.var(), + SignedAmountBranchParam { + on_true: &zero_fee, + on_false: &new_account_fees, + }, + w, + ); - w.exists(new_account_fees_total.force_value()); // Made in the `add_flagged` call let (amt, _overflow) = amt0.add_flagged(&new_account_fees_total, w); amt diff --git a/ledger/src/proofs/zkapp.rs b/ledger/src/proofs/zkapp.rs index a66891a986..797d71b2cd 100644 --- a/ledger/src/proofs/zkapp.rs +++ b/ledger/src/proofs/zkapp.rs @@ -1075,8 +1075,8 @@ fn zkapp_main( ledger: witness.global_second_pass_ledger.clone(), hash: statement.source.second_pass_ledger, }, - fee_excess: CheckedSigned::zero(), - supply_increase: CheckedSigned::zero(), + fee_excess: CheckedSigned::constant_zero(), + supply_increase: CheckedSigned::constant_zero(), protocol_state: state_body.view(), block_global_slot, }; diff --git a/ledger/src/zkapps/intefaces.rs b/ledger/src/zkapps/intefaces.rs index ae8a9b9856..758767c06a 100644 --- a/ledger/src/zkapps/intefaces.rs +++ b/ledger/src/zkapps/intefaces.rs @@ -142,11 +142,7 @@ where fn negate(&self) -> Self; fn add_flagged(&self, other: &Self, w: &mut Self::W) -> (Self, Self::Bool); fn of_unsigned(unsigned: Self::Amount) -> Self; - fn on_if<'a>( - b: Self::Bool, - param: SignedAmountBranchParam<&'a Self>, - w: &mut Self::W, - ) -> &'a Self; + fn on_if(b: Self::Bool, param: SignedAmountBranchParam<&Self>, w: &mut Self::W) -> Self; } pub trait BalanceInterface @@ -226,6 +222,7 @@ pub struct StackFrameMakeParams<'a, Calls> { pub calls: &'a Calls, } +#[derive(Debug)] pub struct SignedAmountBranchParam { pub on_true: T, pub on_false: T, @@ -583,8 +580,7 @@ where >; type SignedAmount: SignedAmountInterface + std::fmt::Debug - + Clone - + ToFieldElements; + + Clone; type Amount: AmountInterface + Clone; type Balance: BalanceInterface< W = Self::WitnessGenerator, diff --git a/ledger/src/zkapps/non_snark.rs b/ledger/src/zkapps/non_snark.rs index 17a1ad4629..0679085304 100644 --- a/ledger/src/zkapps/non_snark.rs +++ b/ledger/src/zkapps/non_snark.rs @@ -401,15 +401,11 @@ impl SignedAmountInterface for Signed { fn of_unsigned(unsigned: Self::Amount) -> Self { Self::of_unsigned(unsigned) } - fn on_if<'a>( - b: Self::Bool, - param: SignedAmountBranchParam<&'a Self>, - w: &mut Self::W, - ) -> &'a Self { + fn on_if(b: Self::Bool, param: SignedAmountBranchParam<&Self>, w: &mut Self::W) -> Self { let SignedAmountBranchParam { on_true, on_false } = param; match b { - true => on_true, - false => on_false, + true => *on_true, + false => *on_false, } } } diff --git a/ledger/src/zkapps/snark.rs b/ledger/src/zkapps/snark.rs index 49806e3a60..f7463779a1 100644 --- a/ledger/src/zkapps/snark.rs +++ b/ledger/src/zkapps/snark.rs @@ -1,4 +1,4 @@ -use std::{fmt::Write, marker::PhantomData}; +use std::{cell::Cell, fmt::Write, marker::PhantomData}; use ark_ff::Zero; use mina_hasher::Fp; @@ -189,7 +189,7 @@ impl SignedAmountInterface for CheckedSigned> { type Amount = SnarkAmount; fn zero() -> Self { - CheckedSigned::zero() + CheckedSigned::of_unsigned( as CheckedCurrency>::zero()) } fn is_neg(&self) -> Self::Bool { CheckedSigned::is_neg(self).var() @@ -210,21 +210,32 @@ impl SignedAmountInterface for CheckedSigned> { fn of_unsigned(unsigned: Self::Amount) -> Self { Self::of_unsigned(unsigned) } - fn on_if<'a>( - b: Self::Bool, - param: SignedAmountBranchParam<&'a Self>, - w: &mut Self::W, - ) -> &'a Self { + fn on_if(b: Self::Bool, param: SignedAmountBranchParam<&Self>, w: &mut Self::W) -> Self { let SignedAmountBranchParam { on_true, on_false } = param; - let amount = w.exists_no_check(match b.as_boolean() { + let amount = match b.as_boolean() { Boolean::True => on_true, Boolean::False => on_false, - }); - if on_true.try_get_value().is_some() && on_false.try_get_value().is_some() { - w.exists_no_check(amount.force_value()); + }; + + // TODO: This should be moved in a `Sgn::on_if` + let sgn = match (on_true.sgn, on_false.sgn) { + (CircuitVar::Constant(_), CircuitVar::Constant(_)) => { + CircuitVar::Var(*amount.sgn.value()) + } + _ => CircuitVar::Var(w.exists_no_check(*amount.sgn.value())), + }; + w.exists_no_check(&amount.magnitude); + + let value = match (on_true.try_get_value(), on_false.try_get_value()) { + (Some(_), Some(_)) => Some(w.exists_no_check(amount.force_value())), + _ => None, + }; + Self { + value: Cell::new(value), + sgn, + ..amount.clone() } - amount } } diff --git a/ledger/src/zkapps/zkapp_logic.rs b/ledger/src/zkapps/zkapp_logic.rs index 74c7c6fe04..3c831b9c8e 100644 --- a/ledger/src/zkapps/zkapp_logic.rs +++ b/ledger/src/zkapps/zkapp_logic.rs @@ -696,7 +696,7 @@ where ); let first = Z::Bool::or( creation_overflow, - Z::SignedAmount::is_neg(balance_change), + Z::SignedAmount::is_neg(&balance_change), w, ); Z::LocalState::add_check( @@ -705,7 +705,7 @@ where Z::Bool::and(pay_creation_fee, first, w).neg(), w, ); - ((), balance_change.clone()) + ((), balance_change) }; // Apply balance change. From 066dbca228996b3c5f47b3a02ea91a7a50acbcf2 Mon Sep 17 00:00:00 2001 From: Vladislav Melnik Date: Fri, 8 Nov 2024 12:24:45 +0100 Subject: [PATCH 028/175] (fix): minor fix for p2p service --- node/common/src/service/p2p.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/node/common/src/service/p2p.rs b/node/common/src/service/p2p.rs index 8a1c7cc197..631aed0ad0 100644 --- a/node/common/src/service/p2p.rs +++ b/node/common/src/service/p2p.rs @@ -65,6 +65,7 @@ impl webrtc::P2pServiceWebrtc for NodeService { ) { let encrypted = auth.encrypt(&self.p2p.sec_key, other_pub_key, &mut self.rng); if let Some(peer) = self.peers().get(&peer_id) { + #[cfg(feature = "p2p-webrtc")] let _ = peer .cmd_sender .send(webrtc::PeerCmd::ConnectionAuthorizationSend(encrypted)); From 2c0517ba989764a6045698ef9ee21e3498d685f1 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:12:08 +0200 Subject: [PATCH 029/175] Frontend - Web Node Error handling (#877) --- frontend/src/app/app.component.ts | 4 ++-- frontend/src/app/app.module.ts | 4 +--- .../src/app/core/services/web-node.service.ts | 18 +++++++++--------- .../web-node-demo-dashboard.component.html | 6 +++--- .../web-node-demo-dashboard.component.scss | 4 ++++ 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 8d44c2f904..296df43b3e 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -20,8 +20,8 @@ import { Routes } from '@shared/enums/routes.enum'; export class AppComponent extends StoreDispatcher implements OnInit { protected readonly menu$: Observable = this.select$(AppSelectors.menu); - protected readonly showLandingPage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === '/')); - protected readonly showLoadingWebNodePage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === `/${Routes.LOADING_WEB_NODE}`)); + protected readonly showLandingPage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === '/' || route.url.startsWith('/?'))); + protected readonly showLoadingWebNodePage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url.startsWith(`/${Routes.LOADING_WEB_NODE}`))); subMenusLength: number = 0; hideToolbar: boolean = CONFIG.hideToolbar; loaded: boolean; diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index c04c0ff09e..df15f2ead3 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -44,8 +44,6 @@ export class AppGlobalErrorhandler implements ErrorHandler { constructor(private errorHandlerService: GlobalErrorHandlerService) {} handleError(error: any): void { - console.log(123123123); - Sentry.captureException(error); this.errorHandlerService.handleError(error); console.error(error); } @@ -90,9 +88,9 @@ export class AppGlobalErrorhandler implements ErrorHandler { ], providers: [ THEME_PROVIDER, - { provide: ErrorHandler, useClass: AppGlobalErrorhandler, deps: [GlobalErrorHandlerService] }, { provide: LOCALE_ID, useValue: 'en' }, { provide: ErrorHandler, useValue: Sentry.createErrorHandler() }, + { provide: ErrorHandler, useClass: AppGlobalErrorhandler, deps: [GlobalErrorHandlerService] }, { provide: Sentry.TraceService, deps: [Router] }, { provide: APP_INITIALIZER, diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index 8763276c60..295d373bff 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -91,7 +91,7 @@ export class WebNodeService { return from(wasm.run(this.webNodeKeyPair.privateKey)); }), tap((webnode: any) => { - (window as any)['webnode'] = webnode; + any(window)['webnode'] = webnode; this.webnode$.next(webnode); this.webnodeProgress$.next('Started'); }), @@ -108,14 +108,14 @@ export class WebNodeService { get status$(): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).status())), + switchMap(handle => from(any(handle).status())), ); } get blockProducerStats$(): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).stats().block_producer())), + switchMap(handle => from(any(handle).stats().block_producer())), ); } @@ -144,42 +144,42 @@ export class WebNodeService { get messageProgress$(): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).state().message_progress())), + switchMap(handle => from(any(handle).state().message_progress())), ); } get sync$(): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).stats().sync())), + switchMap(handle => from(any(handle).stats().sync())), ); } get accounts$(): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).ledger().latest().accounts().all())), + switchMap(handle => from(any(handle).ledger().latest().accounts().all())), ); } get bestChainUserCommands$(): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).transition_frontier().best_chain().user_commands())), + switchMap(handle => from(any(handle).transition_frontier().best_chain().user_commands())), ); } sendPayment$(payment: any): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).transaction_pool().inject().payment(payment))), + switchMap(handle => from(any(handle).transaction_pool().inject().payment(payment))), ); } get transactionPool$(): Observable { return this.webnode$.asObservable().pipe( filter(Boolean), - switchMap(handle => from((handle as any).transaction_pool().get())), + switchMap(handle => from(any(handle).transaction_pool().get())), ); } } diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html index 4bdfc683d5..17f3965093 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html @@ -1,7 +1,7 @@
-
+
@@ -32,7 +32,7 @@
@if (!loading[loading.length - 1].loaded && errors.length) { -
+
@@ -47,7 +47,7 @@
}
-
+
lightbulb
diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss index aa5a2c9601..182301f098 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss @@ -52,6 +52,10 @@ $white: #000000; } } +.errors { + max-width: 568px; +} + .footer { height: 72px; max-width: 568px; From 60b6972ee9e5dcffce111c4df9a9b5ec7ed6c70b Mon Sep 17 00:00:00 2001 From: Daniel Kuehr Date: Thu, 7 Nov 2024 13:50:59 -0500 Subject: [PATCH 030/175] Fix arithmetic and other lints --- Cargo.lock | 2 +- Cargo.toml | 4 +- node/build.rs | 13 +++-- node/common/src/service/p2p.rs | 4 +- .../block_producer/block_producer_reducer.rs | 36 ++++++++++---- .../block_producer/block_producer_state.rs | 9 +++- node/src/block_producer/mod.rs | 34 +++++++++++--- .../block_producer_vrf_evaluator_actions.rs | 6 ++- .../block_producer_vrf_evaluator_reducer.rs | 11 +++-- .../block_producer_vrf_evaluator_state.rs | 15 ++++-- node/src/ledger/ledger_service.rs | 2 +- node/src/ledger/mod.rs | 6 +-- node/src/recorder/recorder.rs | 15 ++++-- node/src/rpc/mod.rs | 2 +- .../rpc_effectful/rpc_effectful_effects.rs | 28 +++++++---- node/src/snark_pool/snark_pool_state.rs | 10 ++-- node/src/state.rs | 30 +++++++++--- node/src/stats/stats_actions.rs | 34 ++++++++++---- node/src/stats/stats_block_producer.rs | 8 ++-- node/src/stats/stats_sync.rs | 15 +++++- .../transition_frontier_genesis_config.rs | 25 +++++----- ...on_frontier_sync_ledger_snarked_reducer.rs | 17 +++++-- ...tion_frontier_sync_ledger_snarked_state.rs | 8 ++-- .../sync/transition_frontier_sync_reducer.rs | 4 +- .../transition_frontier_effects.rs | 4 +- .../transition_frontier_reducer.rs | 5 +- .../transition_frontier_state.rs | 30 +++++++++--- node/testing/src/service/mod.rs | 4 +- p2p/src/channels/p2p_channels_service.rs | 4 +- ...s_signaling_discovery_effectful_effects.rs | 4 +- ...ls_signaling_exchange_effectful_effects.rs | 4 +- p2p/src/identity/secret_key.rs | 47 ++++++++++++++----- .../network/kad/p2p_network_kad_internals.rs | 24 ++++++---- p2p/src/service_impl/mod.rs | 4 +- p2p/src/service_impl/webrtc/mod.rs | 4 +- p2p/src/service_impl/webrtc_with_libp2p.rs | 4 +- p2p/testing/src/service.rs | 4 +- 37 files changed, 333 insertions(+), 147 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bbde61f6a..cac2cd9832 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5686,7 +5686,7 @@ dependencies = [ [[package]] name = "redux" version = "0.1.0" -source = "git+https://github.com/openmina/redux-rs.git?rev=741a01d#741a01df74b84715391651438c1b1ff60d117901" +source = "git+https://github.com/openmina/redux-rs.git?rev=ab14890c#ab14890c68fa478ccfec9d499a76d25f20759619" dependencies = [ "enum_dispatch", "linkme", diff --git a/Cargo.toml b/Cargo.toml index 678545e435..acaccb5bf5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ members = [ resolver = "2" [workspace.lints.clippy] -unwrap_used = "warn" +#unwrap_used = "warn" arithmetic_side_effects = "warn" indexing_slicing = "warn" @@ -53,7 +53,7 @@ poly-commitment = {git = "https://github.com/openmina/proof-systems", rev = "2fd libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false } vrf = { path = "vrf" } openmina-node-account = { path = "node/account" } -redux = { git = "https://github.com/openmina/redux-rs.git", rev = "741a01d", features = ["serde"] } +redux = { git = "https://github.com/openmina/redux-rs.git", rev = "ab14890c", features = ["serde"] } serde = "1.0.190" serde_json = "1.0.107" serde_with = { version = "3.7.0", features = ["hex"] } diff --git a/node/build.rs b/node/build.rs index f12d405c19..dc9ae8de89 100644 --- a/node/build.rs +++ b/node/build.rs @@ -126,7 +126,7 @@ fn main() -> Result<(), Box> { visit_dirs(&node_dir, &mut |file| { let mut path = file.path(); - let path_str = path.to_str().unwrap(); + let path_str = path.to_str().expect("path"); if !path_str.ends_with("_actions.rs") && !path_str.ends_with("action.rs") { return; } @@ -156,7 +156,8 @@ fn main() -> Result<(), Box> { if let Some(action_name) = matches.get(2) { let action_name = action_name.as_str().to_owned(); // Without 'Action' suffix - let action_name_base = action_name[..(action_name.len() - 6)].to_string(); + let action_name_base = + action_name[..(action_name.len().saturating_sub(6))].to_string(); let mut variant_lines = vec![]; loop { let Some(line) = lines.next() else { break }; @@ -252,8 +253,7 @@ fn main() -> Result<(), Box> { .map(|(k, v)| { let mut s = "use crate::".to_owned(); if !k.is_empty() { - s += &k.join("::"); - s += "::"; + s.push_str(&format!("{}::", k.join("::"))); } s += &format!("{{{}}};", v.join(", ")); s @@ -268,8 +268,7 @@ fn main() -> Result<(), Box> { if meta.is_inlined() { meta.action_kinds() } else { - // Remove suffix `Action` from action name. - vec![name[..(name.len() - 6)].to_string()] + vec![name[..name.len().saturating_sub(6)].to_string()] } }); let action_kinds = std::iter::once("None".to_owned()) @@ -304,7 +303,7 @@ fn main() -> Result<(), Box> { while let Some(action_name) = queue.pop_front() { let fn_body = match actions.get(dbg!(&action_name)).unwrap() { ActionMeta::Struct => { - let action_kind = &action_name[..(action_name.len() - 6)]; + let action_kind = &action_name[..(action_name.len().saturating_sub(6))]; format!("ActionKind::{action_kind}") } ActionMeta::Enum(variants) => { diff --git a/node/common/src/service/p2p.rs b/node/common/src/service/p2p.rs index 8a1c7cc197..328960253e 100644 --- a/node/common/src/service/p2p.rs +++ b/node/common/src/service/p2p.rs @@ -44,7 +44,7 @@ impl webrtc::P2pServiceWebrtc for NodeService { &mut self, other_pk: &PublicKey, message: &T, - ) -> Result { + ) -> Result> { let rng = &mut self.rng; self.p2p.sec_key.encrypt(other_pk, rng, message) } @@ -53,7 +53,7 @@ impl webrtc::P2pServiceWebrtc for NodeService { &mut self, other_pk: &PublicKey, encrypted: &T::Encrypted, - ) -> Result { + ) -> Result> { self.p2p.sec_key.decrypt(other_pk, encrypted) } diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index 87ec1a0fa2..f9cca60e45 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -145,9 +145,10 @@ impl BlockProducerEnabled { if let Some(won_slot) = state.current.won_slot() { if let Some(chain) = best_chain.last().map(|best_tip| { if best_tip.global_slot() == won_slot.global_slot() { - // We are producing block which replaces current best tip - // instead of extending it. - best_chain[..(best_chain.len() - 1)].to_vec() + best_chain + .get(..best_chain.len().saturating_sub(1)) + .unwrap_or(&[]) + .to_vec() } else { best_chain.to_vec() } @@ -430,14 +431,24 @@ impl BlockProducerEnabled { epoch_length: v2::UnsignedExtendedUInt32StableV1(1.into()), }; let epoch_count = v2::UnsignedExtendedUInt32StableV1( - (pred_consensus_state.epoch_count.as_u32() + 1).into(), + (pred_consensus_state + .epoch_count + .as_u32() + .checked_add(1) + .expect("overflow")) + .into(), ); (staking_data, next_data, epoch_count) } else { assert_eq!(pred_epoch, next_epoch); let mut next_data = pred_consensus_state.next_epoch_data.clone(); next_data.epoch_length = v2::UnsignedExtendedUInt32StableV1( - (next_data.epoch_length.as_u32() + 1).into(), + (next_data + .epoch_length + .as_u32() + .checked_add(1) + .expect("overflow")) + .into(), ); ( pred_consensus_state.staking_epoch_data.clone(), @@ -475,7 +486,8 @@ impl BlockProducerEnabled { let is_same_global_sub_window = pred_global_sub_window == next_global_sub_window; let are_windows_overlapping = pred_global_sub_window - + constraint_constants().sub_windows_per_window as u32 + .checked_add(constraint_constants().sub_windows_per_window as u32) + .expect("overflow") >= next_global_sub_window; let current_sub_window_densities = pred_sub_window_densities @@ -525,7 +537,7 @@ impl BlockProducerEnabled { 0 }; if incr_window { - density + 1 + density.saturating_add(1) } else { density } @@ -545,7 +557,9 @@ impl BlockProducerEnabled { &global_slot_since_genesis, ); let consensus_state = v2::ConsensusProofOfStakeDataConsensusStateValueStableV2 { - blockchain_length: v2::UnsignedExtendedUInt32StableV1((pred_block.height() + 1).into()), + blockchain_length: v2::UnsignedExtendedUInt32StableV1( + (pred_block.height().checked_add(1).expect("overflow")).into(), + ), epoch_count, min_window_density, sub_window_densities, @@ -592,7 +606,11 @@ impl BlockProducerEnabled { 0 => (pred_block.hash().clone(), List::new()), chain_proof_len => { // TODO(binier): test - let mut iter = chain.iter().rev().take(chain_proof_len + 1).rev(); + let mut iter = chain + .iter() + .rev() + .take(chain_proof_len.saturating_add(1)) + .rev(); if let Some(first_block) = iter.next() { let first_hash = first_block.hash().clone(); let body_hashes = iter diff --git a/node/src/block_producer/block_producer_state.rs b/node/src/block_producer/block_producer_state.rs index 69c7405a03..384d1ad8c2 100644 --- a/node/src/block_producer/block_producer_state.rs +++ b/node/src/block_producer/block_producer_state.rs @@ -302,8 +302,13 @@ impl BlockProducerCurrentState { match self { Self::WonSlot { won_slot, .. } | Self::WonSlotWait { won_slot, .. } => { // Make sure to only producer blocks when in the slot interval - let slot_upper_bound = won_slot.slot_time + slot_interval; - let estimated_produced_time = now + BLOCK_PRODUCTION_ESTIMATE; + let slot_upper_bound = won_slot + .slot_time + .checked_add(slot_interval) + .expect("overflow"); + let estimated_produced_time = now + .checked_add(BLOCK_PRODUCTION_ESTIMATE) + .expect("overflow"); estimated_produced_time >= won_slot.slot_time && now < slot_upper_bound } _ => false, diff --git a/node/src/block_producer/mod.rs b/node/src/block_producer/mod.rs index e0fd494eb1..e9630f9ba2 100644 --- a/node/src/block_producer/mod.rs +++ b/node/src/block_producer/mod.rs @@ -78,7 +78,13 @@ impl BlockProducerWonSlot { fn calculate_slot_time(genesis_timestamp: redux::Timestamp, slot: u32) -> redux::Timestamp { // FIXME: this calculation must use values from the protocol constants, // now it assumes 3 minutes blocks. - genesis_timestamp + (slot as u64) * 3 * 60 * 1_000_000_000_u64 + genesis_timestamp + .checked_add( + (slot as u64) + .checked_mul(3u64.saturating_mul(60).saturating_mul(1_000_000_000_u64)) + .expect("overflow"), + ) + .expect("overflow") } pub fn global_slot(&self) -> u32 { @@ -86,14 +92,16 @@ impl BlockProducerWonSlot { } pub fn epoch(&self) -> u32 { - self.global_slot() / self.global_slot.slots_per_epoch.as_u32() + self.global_slot() + .checked_div(self.global_slot.slots_per_epoch.as_u32()) + .expect("division by 0") } pub fn global_slot_since_genesis( &self, slot_diff: u32, ) -> v2::MinaNumbersGlobalSlotSinceGenesisMStableV1 { - let slot = self.global_slot() + slot_diff; + let slot = self.global_slot().checked_add(slot_diff).expect("overflow"); v2::MinaNumbersGlobalSlotSinceGenesisMStableV1::SinceGenesis(slot.into()) } @@ -105,7 +113,9 @@ impl BlockProducerWonSlot { } pub fn next_slot_time(&self) -> redux::Timestamp { - self.slot_time + 3 * 60 * 1_000_000_000_u64 + self.slot_time + .checked_add(3u64.saturating_mul(60).saturating_mul(1_000_000_000_u64)) + .expect("overflow") } } @@ -145,14 +155,24 @@ impl PartialOrd for BlockProducerWonSlot { } pub fn to_epoch_and_slot(global_slot: &v2::ConsensusGlobalSlotStableV1) -> (u32, u32) { - let epoch = global_slot.slot_number.as_u32() / global_slot.slots_per_epoch.as_u32(); - let slot = global_slot.slot_number.as_u32() % global_slot.slots_per_epoch.as_u32(); + let epoch = global_slot + .slot_number + .as_u32() + .checked_div(global_slot.slots_per_epoch.as_u32()) + .expect("division by 0"); + let slot = global_slot + .slot_number + .as_u32() + .checked_rem(global_slot.slots_per_epoch.as_u32()) + .expect("division by 0"); (epoch, slot) } pub fn next_epoch_first_slot(global_slot: &v2::ConsensusGlobalSlotStableV1) -> u32 { let (epoch, _) = to_epoch_and_slot(global_slot); - (epoch + 1) * global_slot.slots_per_epoch.as_u32() + (epoch.saturating_add(1)) + .checked_mul(global_slot.slots_per_epoch.as_u32()) + .expect("overflow") } // Returns the epoch number and whether it is the last slot of the epoch diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs index 9a1afb2c6d..b5ed604638 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs @@ -133,7 +133,11 @@ impl redux::EnablingCondition for BlockProducerVrfEvaluatorAction } => state.block_producer.with(false, |this| { if this.vrf_evaluator.is_slot_requested() { if let Some(current_evaluation) = this.vrf_evaluator.current_evaluation() { - current_evaluation.latest_evaluated_slot + 1 == vrf_output.global_slot() + current_evaluation + .latest_evaluated_slot + .checked_add(1) + .expect("overflow") + == vrf_output.global_slot() && current_evaluation.epoch_data.ledger == *staking_ledger_hash } else { false diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs index 93e789260a..880db568c9 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs @@ -191,7 +191,8 @@ impl BlockProducerVrfEvaluatorState { best_tip_epoch, root_block_epoch: *root_block_epoch, is_current_epoch_evaluated: state.is_epoch_evaluated(best_tip_epoch), - is_next_epoch_evaluated: state.is_epoch_evaluated(best_tip_epoch + 1), + is_next_epoch_evaluated: state + .is_epoch_evaluated(best_tip_epoch.checked_add(1).expect("overflow")), last_evaluated_epoch: state.last_evaluated_epoch(), staking_epoch_data: staking_epoch_data.clone(), next_epoch_data: next_epoch_data.clone(), @@ -235,7 +236,8 @@ impl BlockProducerVrfEvaluatorState { time: meta.time(), best_tip_epoch: *best_tip_epoch, is_current_epoch_evaluated: state.is_epoch_evaluated(*best_tip_epoch), - is_next_epoch_evaluated: state.is_epoch_evaluated(best_tip_epoch + 1), + is_next_epoch_evaluated: state + .is_epoch_evaluated(best_tip_epoch.checked_add(1).expect("overflow")), best_tip_slot: *best_tip_slot, best_tip_global_slot: *best_tip_global_slot, next_epoch_first_slot: *next_epoch_first_slot, @@ -425,7 +427,10 @@ impl BlockProducerVrfEvaluatorState { } => { let (epoch_number, initial_slot) = match state.epoch_context() { super::EpochContext::Current(_) => (*best_tip_epoch, *current_global_slot), - super::EpochContext::Next(_) => (best_tip_epoch + 1, next_epoch_first_slot - 1), + super::EpochContext::Next(_) => ( + best_tip_epoch.checked_add(1).expect("overflow"), + next_epoch_first_slot.checked_sub(1).expect("underflow"), + ), super::EpochContext::Waiting => todo!(), }; state.status = BlockProducerVrfEvaluatorStatus::InitialSlotSelection { diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_state.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_state.rs index 78c0b34b32..12bf6dd7f9 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_state.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_state.rs @@ -46,7 +46,7 @@ impl BlockProducerVrfEvaluatorState { pub fn evaluate_epoch_bounds(global_slot: &u32) -> SlotPositionInEpoch { if global_slot % SLOTS_PER_EPOCH == 0 { SlotPositionInEpoch::Beginning - } else if (global_slot + 1) % SLOTS_PER_EPOCH == 0 { + } else if (global_slot.checked_add(1).expect("overflow")) % SLOTS_PER_EPOCH == 0 { SlotPositionInEpoch::End } else { SlotPositionInEpoch::Within @@ -111,7 +111,7 @@ impl BlockProducerVrfEvaluatorState { if !self.is_epoch_evaluated(best_tip_epoch) { self.epoch_context = EpochContext::Current((*staking_epoch_data).into()) - } else if !self.is_epoch_evaluated(best_tip_epoch + 1) { + } else if !self.is_epoch_evaluated(best_tip_epoch.checked_add(1).expect("overflow")) { if root_block_epoch == best_tip_epoch && is_next_epoch_seed_finalized { self.epoch_context = EpochContext::Next((*next_epoch_data).into()) } else { @@ -284,7 +284,9 @@ impl BlockProducerVrfEvaluatorState { { match self.epoch_context { EpochContext::Current(_) => self.last_evaluated_epoch = Some(*epoch_number), - EpochContext::Next(_) => self.last_evaluated_epoch = Some(epoch_number + 1), + EpochContext::Next(_) => { + self.last_evaluated_epoch = Some(epoch_number.checked_add(1).expect("overflow")) + } EpochContext::Waiting => {} } } @@ -333,7 +335,10 @@ impl BlockProducerVrfEvaluatorState { Some(VrfEvaluatorInput::new( pending_evaluation.epoch_data.seed, pending_evaluation.epoch_data.delegator_table, - pending_evaluation.latest_evaluated_slot + 1, + pending_evaluation + .latest_evaluated_slot + .checked_add(1) + .expect("overflow"), pending_evaluation.epoch_data.total_currency, pending_evaluation.epoch_data.ledger, )) @@ -345,7 +350,7 @@ impl BlockProducerVrfEvaluatorState { pub fn retention_slot(&self, current_epoch_number: &u32) -> u32 { const PAST_EPOCHS_TO_KEEP: u32 = 2; let cutoff_epoch = current_epoch_number.saturating_sub(PAST_EPOCHS_TO_KEEP); - (cutoff_epoch * SLOTS_PER_EPOCH).saturating_sub(1) + (cutoff_epoch.saturating_mul(SLOTS_PER_EPOCH)).saturating_sub(1) } pub fn cleanup_old_won_slots(&mut self, current_epoch_number: &u32) { diff --git a/node/src/ledger/ledger_service.rs b/node/src/ledger/ledger_service.rs index 7e9846e4fb..89366f6d88 100644 --- a/node/src/ledger/ledger_service.rs +++ b/node/src/ledger/ledger_service.rs @@ -856,7 +856,7 @@ impl LedgerCtx { let num_accounts = mask.num_accounts() as u64; let first_node_addr = ledger::Address::first( - LEDGER_DEPTH - super::tree_height_for_num_accounts(num_accounts), + LEDGER_DEPTH.saturating_sub(super::tree_height_for_num_accounts(num_accounts)), ); let hash = LedgerHash::from_fp(mask.get_hash(first_node_addr)?); Some((num_accounts, hash)) diff --git a/node/src/ledger/mod.rs b/node/src/ledger/mod.rs index c6ccf614eb..137fc97c98 100644 --- a/node/src/ledger/mod.rs +++ b/node/src/ledger/mod.rs @@ -40,7 +40,7 @@ lazy_static::lazy_static! { use ledger::TreeVersion; std::array::from_fn(|i| { - let hash = ledger::V2::empty_hash_at_height(LEDGER_DEPTH - i); + let hash = ledger::V2::empty_hash_at_height(LEDGER_DEPTH.saturating_sub(i)); v2::MinaBaseLedgerHash0StableV1(hash.into()).into() }) }; @@ -61,7 +61,7 @@ pub fn complete_height_tree_with_empties( let content_hash = content_hash.0.to_field()?; let computed_hash = (subtree_height..LEDGER_DEPTH).fold(content_hash, |prev_hash, height| { - let depth = LEDGER_DEPTH - height; + let depth = LEDGER_DEPTH.saturating_sub(height); let empty_right = ledger_empty_hash_at_depth(depth).0.to_field().unwrap(); // We know empties are valid ledger::V2::hash_node(height, prev_hash, empty_right) }); @@ -109,7 +109,7 @@ pub fn hash_node_at_depth( left: mina_hasher::Fp, right: mina_hasher::Fp, ) -> mina_hasher::Fp { - let height = LEDGER_DEPTH - depth - 1; + let height = LEDGER_DEPTH.saturating_sub(depth).saturating_sub(1); ledger::V2::hash_node(height, left, right) } diff --git a/node/src/recorder/recorder.rs b/node/src/recorder/recorder.rs index eacd8560c3..081c88b011 100644 --- a/node/src/recorder/recorder.rs +++ b/node/src/recorder/recorder.rs @@ -38,7 +38,7 @@ impl Recorder { actions_files.push(Some(file)); Self::OnlyInputActions { - recorder_i: actions_files.len() - 1, + recorder_i: actions_files.len().saturating_sub(1), recorder_path: path, actions_f_bytes_written: 0, actions_f_index, @@ -90,12 +90,14 @@ impl Recorder { }; let mut files = ACTIONS_F.try_lock().unwrap(); - let cur_f = &mut files[*recorder_i]; + let cur_f = files.get_mut(*recorder_i).unwrap(); // TODO: error propagation let file = if *actions_f_bytes_written > 64 * 1024 * 1024 { cur_f.take().unwrap().sync_all().unwrap(); *actions_f_bytes_written = 0; - *actions_f_index += 1; + *actions_f_index = actions_f_index + .checked_add(1) + .expect("overflow in actions_f_index"); cur_f.insert( fs::File::create(super::actions_path(recorder_path, *actions_f_index)) .unwrap(), @@ -113,7 +115,12 @@ impl Recorder { writer.write_all(&encoded).unwrap(); writer.flush().unwrap(); - *actions_f_bytes_written += 8 + encoded.len() as u64; + *actions_f_bytes_written = actions_f_bytes_written + .checked_add( + 8u64.checked_add(encoded.len() as u64) + .expect("overflow in encoded len"), + ) + .expect("overflow in actions_f_bytes_written"); } } } diff --git a/node/src/rpc/mod.rs b/node/src/rpc/mod.rs index 8d70d1a9b7..cbd511863e 100644 --- a/node/src/rpc/mod.rs +++ b/node/src/rpc/mod.rs @@ -653,7 +653,7 @@ pub mod discovery { peer_id: value.peer_id, libp2p: value.peer_id.try_into()?, key: value.key, - dist: this_key - value.key, + dist: this_key.distance(&value.key), addrs: value.addresses().clone(), connection: value.connection, }) diff --git a/node/src/rpc_effectful/rpc_effectful_effects.rs b/node/src/rpc_effectful/rpc_effectful_effects.rs index c1419215fb..9fe4058a7d 100644 --- a/node/src/rpc_effectful/rpc_effectful_effects.rs +++ b/node/src/rpc_effectful/rpc_effectful_effects.rs @@ -79,8 +79,10 @@ pub fn rpc_effects(store: &mut Store, action: ActionWithMeta(store: &mut Store, action: ActionWithMeta(store: &mut Store, action: ActionWithMeta Option { @@ -194,7 +194,7 @@ impl SnarkPoolState { pub fn available_jobs_with_highest_priority(&self, n: usize) -> Vec<&JobState> { // find `n` jobs with lowest order (highest priority). self.available_jobs_iter() - .fold(Vec::with_capacity(n + 1), |mut jobs, job| { + .fold(Vec::with_capacity(n.saturating_add(1)), |mut jobs, job| { jobs.push(job); if jobs.len() > n { jobs.sort_by_key(|job| job.order); @@ -267,7 +267,9 @@ impl JobState { }; let account_updates = match &self.job { OneOrTwo::One(job) => account_updates(job), - OneOrTwo::Two((job1, job2)) => account_updates(job1) + account_updates(job2), + OneOrTwo::Two((job1, job2)) => account_updates(job1) + .checked_add(account_updates(job2)) + .expect("overflow"), }; if matches!( @@ -292,7 +294,7 @@ impl JobSummary { const MAX_LATENCY: Duration = Duration::from_secs(10); let (JobSummary::Tx(n) | JobSummary::Merge(n)) = self; - BASE * (*n as u32) + MAX_LATENCY + BASE.saturating_mul(*n as u32).saturating_add(MAX_LATENCY) } } diff --git a/node/src/state.rs b/node/src/state.rs index a0b4735aed..9b5049af1b 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -280,7 +280,7 @@ impl State { /// and only there! pub fn action_applied(&mut self, action: &ActionWithMeta) { self.last_action = action.meta().clone(); - self.applied_actions_count += 1; + self.applied_actions_count = self.applied_actions_count.checked_add(1).expect("overflow"); } pub fn genesis_block(&self) -> Option { @@ -294,8 +294,14 @@ impl State { let initial_ms = u64::from(genesis.timestamp()) / 1_000_000; let now_ms = u64::from(self.time()) / 1_000_000; let ms = now_ms.saturating_sub(initial_ms); - let slots = ms / constraint_constants().block_window_duration_ms; - Some(initial_slot(&genesis) + slots as u32) + let slots = ms + .checked_div(constraint_constants().block_window_duration_ms) + .expect("division by 0"); + Some( + initial_slot(&genesis) + .checked_add(slots as u32) + .expect("overflow"), + ) } /// Current global slot based on constants and current time. @@ -307,7 +313,11 @@ impl State { pub fn current_slot(&self) -> Option { let slots_per_epoch = self.genesis_block()?.constants().slots_per_epoch.as_u32(); - Some(self.cur_global_slot()? % slots_per_epoch) + Some( + self.cur_global_slot()? + .checked_rem(slots_per_epoch) + .expect("division by 0"), + ) } pub fn cur_global_slot_since_genesis(&self) -> Option { @@ -316,14 +326,22 @@ impl State { pub fn current_epoch(&self) -> Option { let slots_per_epoch = self.genesis_block()?.constants().slots_per_epoch.as_u32(); - Some(self.cur_global_slot()? / slots_per_epoch) + Some( + self.cur_global_slot()? + .checked_div(slots_per_epoch) + .expect("division by 0"), + ) } pub fn should_produce_blocks_after_genesis(&self) -> bool { self.block_producer.is_enabled() && self.genesis_block().map_or(false, |b| { let slot = &b.consensus_state().curr_global_slot_since_hard_fork; - let epoch = slot.slot_number.as_u32() / slot.slots_per_epoch.as_u32(); + let epoch = slot + .slot_number + .as_u32() + .checked_div(slot.slots_per_epoch.as_u32()) + .expect("division by 0"); self.current_epoch() <= Some(epoch) }) } diff --git a/node/src/stats/stats_actions.rs b/node/src/stats/stats_actions.rs index 3c4d3b82a4..6a81a70088 100644 --- a/node/src/stats/stats_actions.rs +++ b/node/src/stats/stats_actions.rs @@ -21,7 +21,10 @@ impl ActionStats { while self.per_block.len() >= 20000 { self.per_block.pop_back(); } - let id = self.per_block.back().map_or(0, |v| v.id + 1); + let id = self + .per_block + .back() + .map_or(0, |v| v.id.checked_add(1).expect("overflow")); self.per_block.push_back(ActionStatsForBlock { id, time, @@ -54,7 +57,7 @@ impl ActionStats { }; let i = id .checked_add(blocks.len() as u64)? - .checked_sub(last.id + 1)?; + .checked_sub(last.id.checked_add(1)?)?; blocks.get(i as usize).cloned() } } @@ -69,16 +72,22 @@ impl ActionStatsSnapshot { } let kind_i = *prev_action.action() as usize; - let duration = action.meta().time_as_nanos() - prev_action.meta().time_as_nanos(); + let duration = action + .meta() + .time_as_nanos() + .saturating_sub(prev_action.meta().time_as_nanos()); // TODO(binier): add constant len in ActionKind instead and use // that for constant vec length. let len = self.0.len(); - let need_len = kind_i + 1; + let need_len = kind_i.checked_add(1).expect("overflow"); if len < need_len { self.0.resize(need_len, Default::default()); } - self.0[kind_i].add(duration); + self.0 + .get_mut(kind_i) + .expect("kind_i out of bounds") + .add(duration); } } @@ -128,11 +137,16 @@ pub struct ActionStatsForBlock { impl ActionStatsForBlock { fn new_action(&mut self, action: &ActionKindWithMeta, prev_action: &ActionKindWithMeta) { - let duration = action.meta().time_as_nanos() - prev_action.meta().time_as_nanos(); + let duration = action + .meta() + .time_as_nanos() + .saturating_sub(prev_action.meta().time_as_nanos()); match prev_action.action() { ActionKind::None => {} - ActionKind::EventSourceWaitForEvents => self.cpu_idle += duration, - _ => self.cpu_busy += duration, + ActionKind::EventSourceWaitForEvents => { + self.cpu_idle = self.cpu_idle.saturating_add(duration) + } + _ => self.cpu_busy = self.cpu_busy.saturating_add(duration), } self.stats.add(action, prev_action); } @@ -182,8 +196,8 @@ impl ActionStatsForRanges { } else { &mut self.above_50_ms }; - stats.total_calls += 1; - stats.total_duration += duration; + stats.total_calls = stats.total_calls.saturating_add(1); + stats.total_duration = stats.total_duration.saturating_add(duration); stats.max_duration = std::cmp::max(stats.max_duration, duration); } } diff --git a/node/src/stats/stats_block_producer.rs b/node/src/stats/stats_block_producer.rs index 2a413ea22e..10cd97ed7c 100644 --- a/node/src/stats/stats_block_producer.rs +++ b/node/src/stats/stats_block_producer.rs @@ -361,13 +361,15 @@ impl From<&BlockWithoutProof> for ProducedBlockTransactions { match &cmd.data { v2::MinaBaseUserCommandStableV2::SignedCommand(v) => match &v.payload.body { v2::MinaBaseSignedCommandPayloadBodyStableV2::Payment(_) => { - res.payments += 1 + res.payments = res.payments.checked_add(1).expect("overflow") } v2::MinaBaseSignedCommandPayloadBodyStableV2::StakeDelegation(_) => { - res.delegations += 1 + res.delegations = res.delegations.checked_add(1).expect("overflow") } }, - v2::MinaBaseUserCommandStableV2::ZkappCommand(_) => res.zkapps += 1, + v2::MinaBaseUserCommandStableV2::ZkappCommand(_) => { + res.zkapps = res.zkapps.checked_add(1).expect("overflow") + } } res }) diff --git a/node/src/stats/stats_sync.rs b/node/src/stats/stats_sync.rs index 596a1fdd57..04a323288c 100644 --- a/node/src/stats/stats_sync.rs +++ b/node/src/stats/stats_sync.rs @@ -309,12 +309,23 @@ impl SyncStats { // }) .enumerate() .map(|(i, s)| { - let height = best_tip_height - i as u32; + let height = best_tip_height.checked_sub(i as u32).expect("underflow"); let hash = s.block_hash().clone(); let pred_hash = s .block() .map(|b| b.pred_hash()) - .unwrap_or_else(|| states[states.len() - i - 2].block_hash()) + .unwrap_or_else(|| { + states + .get( + states + .len() + .saturating_sub(i) + .checked_sub(2) + .expect("underflow"), + ) + .unwrap() // can't fail because index is less than states.len() + .block_hash() + }) .clone(); let mut stats = SyncBlock::new(height, hash, pred_hash); stats.update_with_block_state(s); diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs index 238b6425fb..4ae9444824 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs @@ -78,7 +78,7 @@ pub struct GenesisConfigLoaded { } fn bp_num_delegators(i: usize) -> usize { - (i + 1) * 2 + (i.saturating_add(1)).checked_mul(2).expect("overflow") } #[derive(Debug, thiserror::Error)] @@ -146,7 +146,8 @@ impl GenesisConfig { constants, } => { let (whales, fish) = (*whales, *fish); - let delegator_balance = |balance: u64| move |i| balance / i as u64; + let delegator_balance = + |balance: u64| move |i| balance.checked_div(i as u64).expect("division by 0"); let whales = (0..whales).map(|i| { let balance = 8333_u64; let delegators = (1..=bp_num_delegators(i)).map(delegator_balance(50_000_000)); @@ -423,8 +424,8 @@ impl GenesisConfig { let mut account = ledger::Account::create_with(account_id, Balance::from_mina(balance).unwrap()); account.delegate = delegate; - *total_balance += balance; - *counter += 1; + *total_balance = total_balance.checked_add(balance).expect("overflow"); + *counter = counter.checked_add(1).expect("overflow"); // println!("Created account with balance: {}, total_balance: {}", balance, *total_balance); // Debug print account } @@ -458,12 +459,10 @@ impl GenesisConfig { NonStakers::Count(count) => *std::cmp::min(count, &remaining_accounts), }; - let non_staker_total = total_balance * 20 / 80; - let non_staker_balance = if non_staker_count > 0 { - non_staker_total / non_staker_count as u64 - } else { - 0 - }; + let non_staker_total = total_balance.checked_mul(20).expect("overflow") / 80; + let non_staker_balance = non_staker_total + .checked_div(non_staker_count as u64) + .unwrap_or(0); println!("Non staker total balance: {}", non_staker_total); @@ -486,10 +485,12 @@ impl GenesisConfig { let mask = ledger::Mask::new_root(db); let (mask, total_currency) = accounts.into_iter().try_fold( (mask, 0), - |(mut mask, mut total_currency), account| { + |(mut mask, mut total_currency): (ledger::Mask, u64), account| { let account = account?; let account_id = account.id(); - total_currency += account.balance.as_u64(); + total_currency = total_currency + .checked_add(account.balance.as_u64()) + .expect("overflow"); mask.get_or_create_account(account_id, account).unwrap(); Ok((mask, total_currency)) }, diff --git a/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_reducer.rs b/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_reducer.rs index 0a8bcd0951..bfa153b397 100644 --- a/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_reducer.rs +++ b/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_reducer.rs @@ -316,7 +316,7 @@ impl TransitionFrontierSyncLedgerSnarkedState { // We know at which node to begin querying, so we skip all the intermediary depths let first_node_address = ledger::Address::first( - LEDGER_DEPTH - tree_height_for_num_accounts(*num_accounts), + LEDGER_DEPTH.saturating_sub(tree_height_for_num_accounts(*num_accounts)), ); let expected_hash = contents_hash.clone(); let first_query = (first_node_address, expected_hash); @@ -528,8 +528,16 @@ impl TransitionFrontierSyncLedgerSnarkedState { // from that subtree will be skipped and add them to the count. // Empty node hashes are not counted in the stats. - let empty = ledger_empty_hash_at_depth(address.length() + 1); - *num_hashes_accepted += (*left != empty) as u64 + (*right != empty) as u64; + let empty = + ledger_empty_hash_at_depth(address.length().checked_add(1).expect("overflow")); + + if *left != empty { + *num_hashes_accepted = num_hashes_accepted.checked_add(1).expect("overflow") + } + + if *right != empty { + *num_hashes_accepted = num_hashes_accepted.checked_add(1).expect("overflow") + } if left != previous_left { let previous = queue.insert(address.child_left(), left.clone()); @@ -572,7 +580,8 @@ impl TransitionFrontierSyncLedgerSnarkedState { return; }; - *synced_accounts_count += count; + *synced_accounts_count = + synced_accounts_count.checked_add(*count).expect("overflow"); pending.remove(address); // Dispatch diff --git a/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_state.rs b/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_state.rs index 557e6e2faa..ea85c186be 100644 --- a/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_state.rs +++ b/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_state.rs @@ -229,10 +229,12 @@ impl TransitionFrontierSyncLedgerSnarkedState { // would be more accurate (accounts are fetched in groups of 64, hashes of 2). let tree_height = tree_height_for_num_accounts(*total_accounts_expected); let fill_ratio = (*total_accounts_expected as f64) / 2f64.powf(tree_height as f64); - let num_hashes_estimate = 2u64.pow((tree_height - ACCOUNT_SUBTREE_HEIGHT) as u32); + let num_hashes_estimate = 2u64 + .saturating_pow((tree_height.saturating_sub(ACCOUNT_SUBTREE_HEIGHT)) as u32); let num_hashes_estimate = (num_hashes_estimate as f64 * fill_ratio).ceil() as u64; - let fetched = *synced_accounts_count + synced_hashes_count; - let estimation = fetched.max(*total_accounts_expected + num_hashes_estimate); + let fetched = synced_accounts_count.saturating_add(*synced_hashes_count); + let estimation = + fetched.max(total_accounts_expected.saturating_add(num_hashes_estimate)); Some(LedgerSyncProgress { fetched, diff --git a/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs b/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs index 029a2b7667..7f8f742b65 100644 --- a/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs +++ b/node/src/transition_frontier/sync/transition_frontier_sync_reducer.rs @@ -439,7 +439,7 @@ impl TransitionFrontierSyncState { best_chain.iter().map(|b| (b.hash(), b)).collect(); let k = best_tip.constants().k.as_u32() as usize; - let mut chain = Vec::with_capacity(k + root_block_updates.len()); + let mut chain = Vec::with_capacity(k.saturating_add(root_block_updates.len())); // TODO(binier): maybe time should be when we originally // applied this block? Same for below. @@ -654,7 +654,7 @@ impl TransitionFrontierSyncState { return; }; let mut needed_protocol_states = std::mem::take(needed_protocol_states); - let start_i = chain.len().saturating_sub(k + 1); + let start_i = chain.len().saturating_sub(k.saturating_add(1)); let mut iter = std::mem::take(chain) .into_iter() .filter_map(|v| v.take_applied_block()); diff --git a/node/src/transition_frontier/transition_frontier_effects.rs b/node/src/transition_frontier/transition_frontier_effects.rs index 07428a03ae..9597d639f9 100644 --- a/node/src/transition_frontier/transition_frontier_effects.rs +++ b/node/src/transition_frontier/transition_frontier_effects.rs @@ -231,7 +231,9 @@ pub fn transition_frontier_effects( best_tip.height().saturating_sub(b1.height()) as usize; if height_diff == 0 { best_tip.hash() != b1.hash() - } else if let Some(index) = chain.len().checked_sub(height_diff + 1) { + } else if let Some(index) = + chain.len().checked_sub(height_diff.saturating_add(1)) + { chain.get(index).map_or(true, |b2| b1.hash() != b2.hash()) } else { true diff --git a/node/src/transition_frontier/transition_frontier_reducer.rs b/node/src/transition_frontier/transition_frontier_reducer.rs index 284846ff3e..420a447c83 100644 --- a/node/src/transition_frontier/transition_frontier_reducer.rs +++ b/node/src/transition_frontier/transition_frontier_reducer.rs @@ -86,7 +86,10 @@ impl TransitionFrontierState { // into transition frontier anymore due to consensus // reasons. let tip = new_chain.last().unwrap(); - *height + tip.constants().k.as_u32() > tip.height() + height + .checked_add(tip.constants().k.as_u32()) + .expect("overflow") + > tip.height() }); state.chain_diff = state.maybe_make_chain_diff(&new_chain); state.best_chain = new_chain; diff --git a/node/src/transition_frontier/transition_frontier_state.rs b/node/src/transition_frontier/transition_frontier_state.rs index 69811b0c0d..9fdde1e3b5 100644 --- a/node/src/transition_frontier/transition_frontier_state.rs +++ b/node/src/transition_frontier/transition_frontier_state.rs @@ -6,6 +6,7 @@ use mina_p2p_messages::v2::{ TransactionHash, }; use openmina_core::block::{AppliedBlock, ArcBlockWithHash}; +use openmina_core::bug_condition; use serde::{Deserialize, Serialize}; use super::genesis::TransitionFrontierGenesisState; @@ -128,22 +129,39 @@ impl TransitionFrontierState { } Some((new_chain_start_at, _)) => { // `new_chain_start_at` is the index of `new_root` in `old_chain` - let old_chain_advanced = &old_chain[new_chain_start_at..]; + let Some(old_chain_advanced) = &old_chain.get(new_chain_start_at..) else { + bug_condition!("old_chain[{}] out of bounds", new_chain_start_at); + return None; + }; // Common length let len = old_chain_advanced.len().min(new_chain.len()); // Find the first different block, search from the end - let diff_start_at = old_chain_advanced[..len] + let diff_start_at = old_chain_advanced + .get(..len) + .unwrap() // can't fail because len is the minimum len .iter() .rev() - .zip(new_chain[..len].iter().rev()) + .zip( + new_chain + .get(..len) + .unwrap() // can't fail because len is the minimum len + .iter() + .rev(), + ) .position(|(old_block, new_block)| old_block == new_block) - .map(|index| len - index) // we started from the end + .map(|index| len.saturating_sub(index)) // we started from the end .unwrap(); // Never panics because we know there is the common root block - let diff_old_chain = &old_chain_advanced[diff_start_at..]; - let diff_new_chain = &new_chain[diff_start_at..]; + let Some(diff_old_chain) = old_chain_advanced.get(diff_start_at..) else { + bug_condition!("old_chain[{}] out of bounds", diff_start_at); + return None; + }; + let Some(diff_new_chain) = new_chain.get(diff_start_at..) else { + bug_condition!("new_chain[{}] out of bounds", diff_start_at); + return None; + }; (diff_old_chain, diff_new_chain) } diff --git a/node/testing/src/service/mod.rs b/node/testing/src/service/mod.rs index e5cae724ce..d8597880dc 100644 --- a/node/testing/src/service/mod.rs +++ b/node/testing/src/service/mod.rs @@ -364,7 +364,7 @@ impl P2pServiceWebrtc for NodeTestingService { &mut self, other_pk: &node::p2p::identity::PublicKey, message: &T, - ) -> Result { + ) -> Result> { self.real.encrypt(other_pk, message) } @@ -372,7 +372,7 @@ impl P2pServiceWebrtc for NodeTestingService { &mut self, other_pub_key: &node::p2p::identity::PublicKey, encrypted: &T::Encrypted, - ) -> Result { + ) -> Result> { self.real.decrypt(other_pub_key, encrypted) } diff --git a/p2p/src/channels/p2p_channels_service.rs b/p2p/src/channels/p2p_channels_service.rs index 38a6eae8d7..faf4be6663 100644 --- a/p2p/src/channels/p2p_channels_service.rs +++ b/p2p/src/channels/p2p_channels_service.rs @@ -12,10 +12,10 @@ pub trait P2pChannelsService: redux::Service { &mut self, other_pk: &PublicKey, message: &T, - ) -> Result; + ) -> Result>; fn decrypt( &mut self, other_pk: &PublicKey, encrypted: &T::Encrypted, - ) -> Result; + ) -> Result>; } diff --git a/p2p/src/channels/signaling/discovery_effectful/p2p_channels_signaling_discovery_effectful_effects.rs b/p2p/src/channels/signaling/discovery_effectful/p2p_channels_signaling_discovery_effectful_effects.rs index b95e028cfd..9580ec90b4 100644 --- a/p2p/src/channels/signaling/discovery_effectful/p2p_channels_signaling_discovery_effectful_effects.rs +++ b/p2p/src/channels/signaling/discovery_effectful/p2p_channels_signaling_discovery_effectful_effects.rs @@ -32,7 +32,7 @@ impl P2pChannelsSignalingDiscoveryEffectfulAction { pub_key, offer, } => match store.service().encrypt(&pub_key, &*offer) { - Err(()) => { + Err(_) => { // todo!("Failed to encrypt webrtc offer. Handle it.") } Ok(offer) => { @@ -49,7 +49,7 @@ impl P2pChannelsSignalingDiscoveryEffectfulAction { .service() .decrypt::(&pub_key, &answer) { - Err(()) => { + Err(_) => { store.dispatch(P2pChannelsSignalingDiscoveryAction::AnswerDecrypted { peer_id, answer: P2pConnectionResponse::SignalDecryptionFailed, diff --git a/p2p/src/channels/signaling/exchange_effectful/p2p_channels_signaling_exchange_effectful_effects.rs b/p2p/src/channels/signaling/exchange_effectful/p2p_channels_signaling_exchange_effectful_effects.rs index d7fa962bc4..58116b1fcc 100644 --- a/p2p/src/channels/signaling/exchange_effectful/p2p_channels_signaling_exchange_effectful_effects.rs +++ b/p2p/src/channels/signaling/exchange_effectful/p2p_channels_signaling_exchange_effectful_effects.rs @@ -34,7 +34,7 @@ impl P2pChannelsSignalingExchangeEffectfulAction { offer, } => { match store.service().decrypt::(&pub_key, &offer) { - Err(()) => { + Err(_) => { store.dispatch(P2pChannelsSignalingExchangeAction::OfferDecryptError { peer_id, }); @@ -67,7 +67,7 @@ impl P2pChannelsSignalingExchangeEffectfulAction { Some(v) => v, }; match store.service().encrypt(&pub_key, &answer) { - Err(()) => bug_condition!("Failed to encrypt webrtc answer. Shouldn't happen since we managed to decrypt sent offer."), + Err(_) => bug_condition!("Failed to encrypt webrtc answer. Shouldn't happen since we managed to decrypt sent offer."), Ok(answer) => { answer_message_send(store.service(), peer_id, Some(answer)); } diff --git a/p2p/src/identity/secret_key.rs b/p2p/src/identity/secret_key.rs index 5237391cc6..30254371c1 100644 --- a/p2p/src/identity/secret_key.rs +++ b/p2p/src/identity/secret_key.rs @@ -56,11 +56,24 @@ use aes_gcm::{ aead::{Aead, AeadCore}, Aes256Gcm, KeyInit, }; + +// TODO: provide more detailed errors +#[derive(Debug, Clone)] +pub struct EncryptError(); + +impl std::fmt::Display for EncryptError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "Encryption error occurred") + } +} + +impl std::error::Error for EncryptError {} + impl SecretKey { - fn shared_key(&self, other_pk: &PublicKey) -> Result { + fn shared_key(&self, other_pk: &PublicKey) -> Result { let key = self.to_x25519().diffie_hellman(&other_pk.to_x25519()); if !key.was_contributory() { - return Err(()); + return Err(EncryptError()); } let key = key.to_bytes(); // eprintln!("[shared_key] {} & {} = {}", self.public_key(), other_pk, hex::encode(&key)); @@ -73,11 +86,15 @@ impl SecretKey { other_pk: &PublicKey, rng: impl Rng + CryptoRng, data: &[u8], - ) -> Result, ()> { + ) -> Result, Box> { let shared_key = self.shared_key(other_pk)?; let nonce = Aes256Gcm::generate_nonce(rng); let mut buffer = Vec::from(AsRef::<[u8]>::as_ref(&nonce)); - buffer.extend(shared_key.encrypt(&nonce, data).or(Err(()))?); + buffer.extend( + shared_key + .encrypt(&nonce, data) + .or(Err(Box::new(EncryptError())))?, + ); Ok(buffer) } @@ -86,24 +103,30 @@ impl SecretKey { other_pk: &PublicKey, rng: impl Rng + CryptoRng, data: &M, - ) -> Result { - let data = serde_json::to_vec(data).or(Err(()))?; + ) -> Result> { + let data = serde_json::to_vec(data).map_err(|_| EncryptError())?; self.encrypt_raw(other_pk, rng, &data).map(Into::into) } - pub fn decrypt_raw(&self, other_pk: &PublicKey, ciphertext: &[u8]) -> Result, ()> { + pub fn decrypt_raw( + &self, + other_pk: &PublicKey, + ciphertext: &[u8], + ) -> Result, EncryptError> { let shared_key = self.shared_key(other_pk)?; - let (nonce, ciphertext) = ciphertext.split_at_checked(12).ok_or(())?; - shared_key.decrypt(nonce.into(), ciphertext).or(Err(())) + let (nonce, ciphertext) = ciphertext.split_at_checked(12).ok_or(EncryptError())?; + shared_key + .decrypt(nonce.into(), ciphertext) + .or(Err(EncryptError())) } pub fn decrypt( &self, other_pk: &PublicKey, ciphertext: &M::Encrypted, - ) -> Result { - let data = self.decrypt_raw(other_pk, ciphertext.as_ref())?; - serde_json::from_slice(&data).or(Err(())) + ) -> Result> { + let data: Vec = self.decrypt_raw(other_pk, ciphertext.as_ref())?; + serde_json::from_slice(&data).map_err(Box::::from) } } diff --git a/p2p/src/network/kad/p2p_network_kad_internals.rs b/p2p/src/network/kad/p2p_network_kad_internals.rs index 3246db4126..5c520af141 100644 --- a/p2p/src/network/kad/p2p_network_kad_internals.rs +++ b/p2p/src/network/kad/p2p_network_kad_internals.rs @@ -66,6 +66,12 @@ mod u256_serde { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)] pub struct P2pNetworkKadKey(#[serde(with = "u256_serde")] U256); +impl P2pNetworkKadKey { + pub fn distance(self, rhs: &Self) -> P2pNetworkKadDist { + P2pNetworkKadDist(self.0 ^ rhs.0) + } +} + #[derive(Clone, Debug, Serialize, PartialEq, Deserialize, thiserror::Error)] pub enum P2pNetworkKadKeyError { #[error("decoding error")] @@ -110,7 +116,7 @@ impl Debug for P2pNetworkKadKey { impl Add<&P2pNetworkKadDist> for &P2pNetworkKadKey { type Output = P2pNetworkKadKey; - #[allow(clippy::suspicious_arithmetic_impl)] + #[allow(clippy::suspicious_arithmetic_impl, clippy::arithmetic_side_effects)] fn add(self, rhs: &P2pNetworkKadDist) -> Self::Output { P2pNetworkKadKey(self.0 ^ rhs.0) } @@ -119,36 +125,36 @@ impl Add<&P2pNetworkKadDist> for &P2pNetworkKadKey { impl Sub for P2pNetworkKadKey { type Output = P2pNetworkKadDist; - #[allow(clippy::suspicious_arithmetic_impl)] + #[allow(clippy::suspicious_arithmetic_impl, clippy::arithmetic_side_effects)] fn sub(self, rhs: Self) -> Self::Output { - P2pNetworkKadDist(self.0 ^ rhs.0) + self.distance(&rhs) } } impl Sub<&P2pNetworkKadKey> for &P2pNetworkKadKey { type Output = P2pNetworkKadDist; - #[allow(clippy::suspicious_arithmetic_impl)] + #[allow(clippy::suspicious_arithmetic_impl, clippy::arithmetic_side_effects)] fn sub(self, rhs: &P2pNetworkKadKey) -> Self::Output { - P2pNetworkKadDist(self.0 ^ rhs.0) + self.distance(rhs) } } impl Sub for &P2pNetworkKadKey { type Output = P2pNetworkKadDist; - #[allow(clippy::suspicious_arithmetic_impl)] + #[allow(clippy::suspicious_arithmetic_impl, clippy::arithmetic_side_effects)] fn sub(self, rhs: P2pNetworkKadKey) -> Self::Output { - P2pNetworkKadDist(self.0 ^ rhs.0) + self.distance(&rhs) } } impl Sub<&P2pNetworkKadKey> for P2pNetworkKadKey { type Output = P2pNetworkKadDist; - #[allow(clippy::suspicious_arithmetic_impl)] + #[allow(clippy::suspicious_arithmetic_impl, clippy::arithmetic_side_effects)] fn sub(self, rhs: &P2pNetworkKadKey) -> Self::Output { - P2pNetworkKadDist(self.0 ^ rhs.0) + self.distance(rhs) } } diff --git a/p2p/src/service_impl/mod.rs b/p2p/src/service_impl/mod.rs index bd5b14f0ed..c6cbf390f3 100644 --- a/p2p/src/service_impl/mod.rs +++ b/p2p/src/service_impl/mod.rs @@ -77,13 +77,13 @@ pub mod webrtc { &mut self, other_pk: &PublicKey, message: &T, - ) -> Result; + ) -> Result>; fn decrypt( &mut self, other_pub_key: &PublicKey, encrypted: &T::Encrypted, - ) -> Result; + ) -> Result>; fn auth_encrypt_and_send( &mut self, diff --git a/p2p/src/service_impl/webrtc/mod.rs b/p2p/src/service_impl/webrtc/mod.rs index c363f39b6b..8704d4396f 100644 --- a/p2p/src/service_impl/webrtc/mod.rs +++ b/p2p/src/service_impl/webrtc/mod.rs @@ -808,13 +808,13 @@ pub trait P2pServiceWebrtc: redux::Service { &mut self, other_pk: &PublicKey, message: &T, - ) -> Result; + ) -> Result>; fn decrypt( &mut self, other_pub_key: &PublicKey, encrypted: &T::Encrypted, - ) -> Result; + ) -> Result>; fn auth_encrypt_and_send( &mut self, diff --git a/p2p/src/service_impl/webrtc_with_libp2p.rs b/p2p/src/service_impl/webrtc_with_libp2p.rs index 7c16c32141..2bab626dcf 100644 --- a/p2p/src/service_impl/webrtc_with_libp2p.rs +++ b/p2p/src/service_impl/webrtc_with_libp2p.rs @@ -172,7 +172,7 @@ impl P2pChannelsService for T { &mut self, other_pk: &crate::identity::PublicKey, message: &M, - ) -> Result { + ) -> Result> { P2pServiceWebrtc::encrypt(self, other_pk, message) } @@ -180,7 +180,7 @@ impl P2pChannelsService for T { &mut self, other_pk: &crate::identity::PublicKey, encrypted: &M::Encrypted, - ) -> Result { + ) -> Result> { P2pServiceWebrtc::decrypt(self, other_pk, encrypted) } } diff --git a/p2p/testing/src/service.rs b/p2p/testing/src/service.rs index 1a25065c54..8ffe1f1a30 100644 --- a/p2p/testing/src/service.rs +++ b/p2p/testing/src/service.rs @@ -104,7 +104,7 @@ impl P2pServiceWebrtc for ClusterService { &mut self, _other_pk: &p2p::identity::PublicKey, _message: &T, - ) -> Result { + ) -> Result> { unreachable!("this is webrtc only and this crate tests libp2p only") } @@ -112,7 +112,7 @@ impl P2pServiceWebrtc for ClusterService { &mut self, _other_pub_key: &p2p::identity::PublicKey, _encrypted: &T::Encrypted, - ) -> Result { + ) -> Result> { unreachable!("this is webrtc only and this crate tests libp2p only") } From d8322e3a70ae7f4408f7f7150ea7cfa9595d0c1d Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:27:33 +0200 Subject: [PATCH 031/175] Frontend - UI Improvements (#879) --- .../web-node-demo-dashboard.component.ts | 2 ++ .../web-node-landing-page.component.html | 6 ++--- frontend/src/index.html | 23 +++++++++++-------- frontend/src/styles.scss | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts index 6e896677a8..4ba335f5e5 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts +++ b/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts @@ -75,6 +75,7 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On private router: Router) { super(); } ngOnInit(): void { + window.dispatchEvent(new CustomEvent('startWebNode')); any(window).testtest = []; this.stepsPercentages = this.getStepPercentages(); this.fetchProgress(); @@ -105,6 +106,7 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On this.loading[2].status = WebNodeStepStatus.LOADING; this.advanceProgressFor3rdStep(); } else if (state === 'Connected') { + this.loadingMessage = 'Web Node is ready'; clearInterval(this.thirdStepInterval); this.loading[0].status = WebNodeStepStatus.DONE; this.loading[1].status = WebNodeStepStatus.DONE; diff --git a/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.html b/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.html index ae628b8723..6263563da9 100644 --- a/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.html +++ b/frontend/src/app/layout/web-node-landing-page/web-node-landing-page.component.html @@ -1,11 +1,11 @@

- With the Web Node, anyone can produce blocks directly through their browser + With the Web Node, you can now produce blocks directly through your browser

An in-browser Mina node capable of producing and validating blocks @@ -13,7 +13,7 @@

- +

diff --git a/frontend/src/index.html b/frontend/src/index.html index 0344746345..03a41c34af 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -42,16 +42,19 @@ diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 04b03573c2..bdc62e97ae 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -23,7 +23,7 @@ body { font-family: $inter-font; font-weight: 400; color: $base-primary; - background-color: $base-background; + background-color: var(--base-background, #000000); } .theme-transition { From ad5477af191829c025a5488ce96178bd34e07816 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:18:32 +0200 Subject: [PATCH 032/175] Frontend - Make Global Error Handler work with WebAssembly Streaming (#880) --- frontend/src/app/app.component.ts | 15 ++-- frontend/src/app/app.module.ts | 70 ++++++++++++++++++- .../src/app/core/services/web-node.service.ts | 54 +++----------- .../web-node-initialization.component.html} | 40 ++++++----- .../web-node-initialization.component.scss} | 0 .../web-node-initialization.component.ts} | 68 +++++++++++++----- .../features/webnode/webnode.component.html | 2 +- .../app/features/webnode/webnode.component.ts | 6 +- .../app/layout/toolbar/toolbar.component.ts | 2 +- .../app/shared/constants/store-functions.ts | 4 +- 10 files changed, 167 insertions(+), 94 deletions(-) rename frontend/src/app/features/webnode/{web-node-demo-dashboard/web-node-demo-dashboard.component.html => web-node-initialization/web-node-initialization.component.html} (56%) rename frontend/src/app/features/webnode/{web-node-demo-dashboard/web-node-demo-dashboard.component.scss => web-node-initialization/web-node-initialization.component.scss} (100%) rename frontend/src/app/features/webnode/{web-node-demo-dashboard/web-node-demo-dashboard.component.ts => web-node-initialization/web-node-initialization.component.ts} (82%) diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 296df43b3e..b352cbad1a 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -9,6 +9,7 @@ import { CONFIG } from '@shared/constants/config'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { Router } from '@angular/router'; import { Routes } from '@shared/enums/routes.enum'; +import { WebNodeService } from '@core/services/web-node.service'; @Component({ selector: 'app-root', @@ -19,9 +20,9 @@ import { Routes } from '@shared/enums/routes.enum'; }) export class AppComponent extends StoreDispatcher implements OnInit { - protected readonly menu$: Observable = this.select$(AppSelectors.menu); - protected readonly showLandingPage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === '/' || route.url.startsWith('/?'))); - protected readonly showLoadingWebNodePage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url.startsWith(`/${Routes.LOADING_WEB_NODE}`))); + readonly menu$: Observable = this.select$(AppSelectors.menu); + readonly showLandingPage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url === '/' || route.url.startsWith('/?'))); + readonly showLoadingWebNodePage$: Observable = this.select$(getMergedRoute).pipe(filter(Boolean), map((route: MergedRoute) => route.url.startsWith(`/${Routes.LOADING_WEB_NODE}`))); subMenusLength: number = 0; hideToolbar: boolean = CONFIG.hideToolbar; loaded: boolean; @@ -29,7 +30,8 @@ export class AppComponent extends StoreDispatcher implements OnInit { private nodeUpdateSubscription: Subscription | null = null; constructor(private breakpointObserver: BreakpointObserver, - private router: Router) { + private router: Router, + private webNodeService: WebNodeService) { super(); if (any(window).Cypress) { any(window).config = CONFIG; @@ -43,7 +45,7 @@ export class AppComponent extends StoreDispatcher implements OnInit { () => this.initAppFunctionalities(), filter(Boolean), take(1), - filter((route: MergedRoute) => route.url !== '/'), + filter((route: MergedRoute) => route.url !== '/' && !route.url.startsWith('/?')), ); this.select( getMergedRoute, @@ -61,6 +63,9 @@ export class AppComponent extends StoreDispatcher implements OnInit { } private initAppFunctionalities(): void { + if (this.webNodeService.hasWebNodeConfig() && !this.webNodeService.isWebNodeLoaded()) { + this.router.navigate([Routes.LOADING_WEB_NODE]); + } this.dispatch2(AppActions.init()); if (!this.hideToolbar && !CONFIG.hideNodeStats) { this.scheduleNodeUpdates(); diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index df15f2ead3..9c2abad0b3 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -41,11 +41,75 @@ registerLocaleData(localeEn, 'en'); @Injectable() export class AppGlobalErrorhandler implements ErrorHandler { - constructor(private errorHandlerService: GlobalErrorHandlerService) {} + constructor(private errorHandlerService: GlobalErrorHandlerService) { + this.setupErrorHandlers(); + + if (WebAssembly) { + this.interceptWebAssembly(); + } + } + + private setupErrorHandlers() { + const self = this; + + // Global error handler + window.onerror = function(msg, url, line, column, error) { + self.handleError(error || msg); + return false; + }; + + // Unhandled promise rejections + window.onunhandledrejection = function(event) { + event.preventDefault(); + self.handleError(event.reason); + }; + + // Regular error listener + window.addEventListener('error', (event: ErrorEvent) => { + event.preventDefault(); + this.handleError(event.error); + }, { capture: true }); + + // Override console.error with proper error extraction + const originalConsoleError = console.error; + console.error = (...args) => { + // Find the actual error object in the arguments + const error = args.find(arg => arg instanceof Error) || + args.join(' '); + + this.handleError(error); + originalConsoleError.apply(console, args); + }; + } + + private interceptWebAssembly() { + const self = this; + + const originalInstantiateStreaming = WebAssembly.instantiateStreaming; + if (originalInstantiateStreaming) { + WebAssembly.instantiateStreaming = async function(response: any, importObject?: any): Promise { + try { + return await originalInstantiateStreaming.call(WebAssembly, response, importObject); + } catch (error) { + self.handleError(error); + throw error; + } + }; + } + + const originalInstantiate = WebAssembly.instantiate; + WebAssembly.instantiate = async function(moduleObject: any, importObject?: any): Promise { + try { + return await originalInstantiate.call(WebAssembly, moduleObject, importObject); + } catch (error) { + self.handleError(error); + throw error; + } + }; + } handleError(error: any): void { this.errorHandlerService.handleError(error); - console.error(error); } } @@ -90,7 +154,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { THEME_PROVIDER, { provide: LOCALE_ID, useValue: 'en' }, { provide: ErrorHandler, useValue: Sentry.createErrorHandler() }, - { provide: ErrorHandler, useClass: AppGlobalErrorhandler, deps: [GlobalErrorHandlerService] }, + { provide: ErrorHandler, useClass: AppGlobalErrorhandler, deps: [GlobalErrorHandlerService], multi: false }, { provide: Sentry.TraceService, deps: [Router] }, { provide: APP_INITIALIZER, diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index 295d373bff..58430ccf3a 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -1,25 +1,12 @@ -import { Inject, Injectable } from '@angular/core'; -import { - BehaviorSubject, - catchError, - EMPTY, - filter, - from, - fromEvent, - map, - merge, - Observable, - of, - switchMap, - tap, -} from 'rxjs'; +import { Injectable } from '@angular/core'; +import { BehaviorSubject, catchError, filter, from, fromEvent, map, merge, Observable, of, switchMap, tap, throwError } from 'rxjs'; import base from 'base-x'; import { any } from '@openmina/shared'; import { HttpClient } from '@angular/common/http'; import { sendSentryEvent } from '@shared/helpers/webnode.helper'; import { DashboardPeerStatus } from '@shared/types/dashboard/dashboard.peer'; -import { DOCUMENT } from '@angular/common'; import { FileProgressHelper } from '@core/helpers/file-progress.helper'; +import { CONFIG } from '@shared/constants/config'; @Injectable({ providedIn: 'root', @@ -33,8 +20,7 @@ export class WebNodeService { readonly webnodeProgress$: BehaviorSubject = new BehaviorSubject(''); - constructor(private http: HttpClient, - @Inject(DOCUMENT) private document: Document) { + constructor(private http: HttpClient) { FileProgressHelper.initDownloadProgress(); const basex = base('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'); any(window)['bs58btc'] = { @@ -43,33 +29,16 @@ export class WebNodeService { }; } - private loadWebnodeJs(): void { - if (this.document.querySelector('[data-webnode]')) { - return; - } - - const script = this.document.createElement('script'); - script.type = 'module'; - script.setAttribute('data-webnode', 'true'); - script.textContent = ` - import('./assets/webnode/pkg/openmina_node_web.js') - .then(v => { - window.webnode = v; - window.dispatchEvent(new CustomEvent('webNodeLoaded')); - }) - .catch(er => { - if (window.env?.configs.some(c => c.isWebNode)) { - console.error('Failed to load Web Node:', er); - } - }); - `; - - this.document.body.appendChild(script); + hasWebNodeConfig(): boolean { + return CONFIG.configs.some(c => c.isWebNode); + } + + isWebNodeLoaded(): boolean { + return !!any(window).webnode; } loadWasm$(): Observable { this.webNodeStartTime = Date.now(); - // this.loadWebnodeJs(); return merge( of(any(window).webnode).pipe(filter(Boolean)), fromEvent(window, 'webNodeLoaded'), @@ -97,8 +66,7 @@ export class WebNodeService { }), catchError((error) => { sendSentryEvent('WebNode failed to start: ' + error.message); - console.error(error); - return of(null); + return throwError(() => new Error(error.message)); }), switchMap(() => this.webnode$.asObservable()), filter(Boolean), diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html similarity index 56% rename from frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html rename to frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html index 17f3965093..8ec6fd9ef7 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.html +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html @@ -9,7 +9,10 @@ right in your browser
-
{{ loadingMessage }}
+
{{ loadingMessage }}
@@ -19,9 +22,10 @@
@if (item.status === WebNodeStepStatus.LOADING) { + } @else if (item.status === WebNodeStepStatus.PENDING) { + panorama_fish_eye } @else { - check_circle + check_circle }
{{ item.name }} @@ -31,21 +35,21 @@
- @if (!loading[loading.length - 1].loaded && errors.length) { -
-
-
-
It appears there are some errors.
-
-
- @for (error of errors; track $index) { -
{{ error }}
- } -
-
-
- } + + + + + + + + + + + + + + +
diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.scss similarity index 100% rename from frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.scss rename to frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.scss diff --git a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts similarity index 82% rename from frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts rename to frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts index 4ba335f5e5..863b81cb77 100644 --- a/frontend/src/app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component.ts +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts @@ -24,11 +24,10 @@ export interface WebNodeLoadingStep { status: WebNodeStepStatus; } - @Component({ - selector: 'mina-web-node-demo-dashboard', - templateUrl: './web-node-demo-dashboard.component.html', - styleUrls: ['./web-node-demo-dashboard.component.scss'], + selector: 'mina-web-node-initialization', + templateUrl: './web-node-initialization.component.html', + styleUrls: ['./web-node-initialization.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'flex-column h-100 w-100 align-center' }, standalone: true, @@ -40,16 +39,15 @@ export interface WebNodeLoadingStep { LoadingSpinnerComponent, ], animations: [ - trigger('fadeIn', [ - state('void', style({ opacity: 0 })), - state('*', style({ opacity: 1 })), - transition('void => *', [ - animate('.6s ease-in'), + trigger('messageChange', [ + transition('* => *', [ + style({ opacity: 0, transform: 'translateY(-10px)' }), + animate('300ms ease-out', style({ opacity: 1, transform: 'translateY(0)' })), ]), ]), ], }) -export class WebNodeDemoDashboardComponent extends StoreDispatcher implements OnInit, AfterViewInit { +export class WebNodeInitializationComponent extends StoreDispatcher implements OnInit, AfterViewInit { protected readonly WebNodeStepStatus = WebNodeStepStatus; readonly loading: WebNodeLoadingStep[] = [ @@ -59,6 +57,8 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On ]; loadingMessage: string = ''; ready: boolean = false; + hasError: boolean = false; + hasWarn: boolean = false; errors: string[] = []; private stepsPercentages: number[]; @@ -91,13 +91,27 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On private checkWebNodeProgress(): void { this.webNodeService.webnodeProgress$.pipe(untilDestroyed(this)).subscribe((state: string) => { if (state === 'Loaded') { - this.loadingMessage = '~5 seconds left'; + this.updateLoadingMessage('~5 seconds left'); + setTimeout(() => { + if (!this.hasError && this.loading[1].status !== WebNodeStepStatus.DONE) { + this.updateLoadingMessage('Slower than usual'); + this.hasWarn = true; + this.detect(); + } + }, 5000); this.loading[0].loaded = true; this.loading[0].status = WebNodeStepStatus.DONE; this.loading[1].status = WebNodeStepStatus.LOADING; this.advanceProgressFor2ndStep(); } else if (state === 'Started') { - this.loadingMessage = '~2 seconds left'; + this.updateLoadingMessage('~2 seconds left'); + setTimeout(() => { + if (!this.hasError && this.loading[2].status !== WebNodeStepStatus.DONE) { + this.updateLoadingMessage('Slower than usual'); + this.hasWarn = true; + this.detect(); + } + }, 2000); clearInterval(this.secondStepInterval); this.loading[0].loaded = true; this.loading[1].loaded = true; @@ -106,7 +120,7 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On this.loading[2].status = WebNodeStepStatus.LOADING; this.advanceProgressFor3rdStep(); } else if (state === 'Connected') { - this.loadingMessage = 'Web Node is ready'; + this.updateLoadingMessage('Web Node is ready'); clearInterval(this.thirdStepInterval); this.loading[0].status = WebNodeStepStatus.DONE; this.loading[1].status = WebNodeStepStatus.DONE; @@ -190,11 +204,22 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On ).subscribe(); } + private updateLoadingMessage(message: string): void { + if (this.hasError || this.hasWarn) { + return; + } + this.loadingMessage = message; + } + private listenToErrorIssuing(): void { this.errorHandler.errors$ - .pipe(untilDestroyed(this)) + .pipe(filter(errors => !!errors.length), untilDestroyed(this)) .subscribe((error: string) => { this.errors.push(error); + this.loadingMessage = error; + this.hasError = true; + this.markErrorOnD3(); + this.detect(); }); } @@ -264,13 +289,13 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On gradient.append('stop') .attr('offset', '8%') - .attr('stop-color', '#57D7FF'); + .attr('stop-color', '#57d7ff'); gradient.append('stop') .attr('offset', '60%') - .attr('stop-color', '#FDA2FF'); + .attr('stop-color', '#fda2ff'); gradient.append('stop') .attr('offset', '100%') - .attr('stop-color', '#FF833D'); + .attr('stop-color', '#ff833d'); this.progressBar.append('text') .attr('text-anchor', 'middle') @@ -314,4 +339,13 @@ export class WebNodeDemoDashboardComponent extends StoreDispatcher implements On .attr('dx', `${numberOfDigits * 0.45}em`) .text('%'); } + + private markErrorOnD3(): void { + this.progressBar.select('path').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('text').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('.symbol').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('path').attr('opacity', 0.4); + this.progressBar.select('text').attr('opacity', 0.8); + this.progressBar.select('.symbol').attr('opacity', 0.4); + } } diff --git a/frontend/src/app/features/webnode/webnode.component.html b/frontend/src/app/features/webnode/webnode.component.html index 98ac206ace..d8370a7d76 100644 --- a/frontend/src/app/features/webnode/webnode.component.html +++ b/frontend/src/app/features/webnode/webnode.component.html @@ -1 +1 @@ - + diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index 676e16709d..fbd8210c2f 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -1,13 +1,11 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { - WebNodeDemoDashboardComponent, -} from '@app/features/webnode/web-node-demo-dashboard/web-node-demo-dashboard.component'; +import { WebNodeInitializationComponent } from '@app/features/webnode/web-node-initialization/web-node-initialization.component'; @Component({ selector: 'mina-webnode', standalone: true, imports: [ - WebNodeDemoDashboardComponent, + WebNodeInitializationComponent, ], templateUrl: './webnode.component.html', styleUrl: './webnode.component.scss', diff --git a/frontend/src/app/layout/toolbar/toolbar.component.ts b/frontend/src/app/layout/toolbar/toolbar.component.ts index b3f60800e5..ca4c0a4ebf 100644 --- a/frontend/src/app/layout/toolbar/toolbar.component.ts +++ b/frontend/src/app/layout/toolbar/toolbar.component.ts @@ -59,7 +59,7 @@ export class ToolbarComponent extends StoreDispatcher implements OnInit { private listenToRouterChange(): void { this.select(getMergedRoute, (url: string) => { - this.title = removeParamsFromURL(url).split('/')[1].replace(/-/g, ' '); + this.title = removeParamsFromURL(url).split('/')[1]?.replace(/-/g, ' '); this.detect(); }, filter(Boolean), map((route: MergedRoute) => route.url)); } diff --git a/frontend/src/app/shared/constants/store-functions.ts b/frontend/src/app/shared/constants/store-functions.ts index 337dbe5597..abb537b8e0 100644 --- a/frontend/src/app/shared/constants/store-functions.ts +++ b/frontend/src/app/shared/constants/store-functions.ts @@ -1,7 +1,7 @@ import { catchError, map, Observable, of, OperatorFunction, repeat } from 'rxjs'; import { ADD_ERROR, ErrorAdd } from '@error-preview/error-preview.actions'; import { HttpErrorResponse } from '@angular/common/http'; -import { FeatureAction, toReadableDate } from '@openmina/shared'; +import { any, FeatureAction, toReadableDate } from '@openmina/shared'; import { MinaErrorType } from '@shared/types/error-preview/mina-error-type.enum'; import { Selector, Store } from '@ngrx/store'; import { MinaState } from '@app/app.setup'; @@ -28,7 +28,7 @@ export const addError = (error: HttpErrorResponse | Error, type: MinaErrorType): payload: { type, message: error.message, - status: (error as any).status ? `${(error as any).status} ${(error as any).statusText}` : undefined, + status: any(error).status ? `${any(error).status} ${any(error).statusText}` : undefined, timestamp: toReadableDate(Number(Date.now()), 'HH:mm:ss'), seen: false, }, From 5afa7c5edd0ced1c8e1a72be7404275cb94c16de Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:51:34 +0200 Subject: [PATCH 033/175] Sending custom error to Sentry (#881) --- frontend/src/app/app.module.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 9c2abad0b3..7b92070751 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -49,7 +49,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { } } - private setupErrorHandlers() { + private setupErrorHandlers(): void { const self = this; // Global error handler @@ -82,7 +82,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { }; } - private interceptWebAssembly() { + private interceptWebAssembly(): void { const self = this; const originalInstantiateStreaming = WebAssembly.instantiateStreaming; @@ -109,6 +109,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { } handleError(error: any): void { + Sentry.captureException(error); this.errorHandlerService.handleError(error); } } From 1564dfca08f87a48ba1dfa932cc9f6e335e8409f Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:27:22 +0200 Subject: [PATCH 034/175] Frontend - Fix loading screen error message (#882) --- frontend/src/app/app.component.ts | 1 + .../web-node-initialization.component.html | 2 +- .../web-node-initialization.component.ts | 655 +++++++++--------- 3 files changed, 330 insertions(+), 328 deletions(-) diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index b352cbad1a..478554678c 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -54,6 +54,7 @@ export class AppComponent extends StoreDispatcher implements OnInit { this.detect(); }, filter(Boolean), + take(1), ); } diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html index 8ec6fd9ef7..2bfabe225f 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html @@ -12,7 +12,7 @@
{{ loadingMessage }}
+ [@messageChange]="loadingMessage">{{ loadingMessage || downloadingMessage }}
diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts index 863b81cb77..f926e3e6ef 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts @@ -6,346 +6,347 @@ import { any, GlobalErrorHandlerService } from '@openmina/shared'; import { NgClass, NgForOf, NgIf, NgOptimizedImage } from '@angular/common'; import { Router } from '@angular/router'; import { getFirstFeature } from '@shared/constants/config'; -import { animate, state, style, transition, trigger } from '@angular/animations'; +import { animate, style, transition, trigger } from '@angular/animations'; import { filter, switchMap, timer } from 'rxjs'; import { LoadingSpinnerComponent } from '@shared/loading-spinner/loading-spinner.component'; import { FileProgressHelper } from '@core/helpers/file-progress.helper'; import * as d3 from 'd3'; export enum WebNodeStepStatus { - DONE, - LOADING, - PENDING, + DONE, + LOADING, + PENDING, } export interface WebNodeLoadingStep { - name: string; - loaded: boolean; - status: WebNodeStepStatus; + name: string; + loaded: boolean; + status: WebNodeStepStatus; } @Component({ - selector: 'mina-web-node-initialization', - templateUrl: './web-node-initialization.component.html', - styleUrls: ['./web-node-initialization.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - host: { class: 'flex-column h-100 w-100 align-center' }, - standalone: true, - imports: [ - NgClass, - NgIf, - NgForOf, - NgOptimizedImage, - LoadingSpinnerComponent, - ], - animations: [ - trigger('messageChange', [ - transition('* => *', [ - style({ opacity: 0, transform: 'translateY(-10px)' }), - animate('300ms ease-out', style({ opacity: 1, transform: 'translateY(0)' })), - ]), - ]), - ], + selector: 'mina-web-node-initialization', + templateUrl: './web-node-initialization.component.html', + styleUrls: ['./web-node-initialization.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'flex-column h-100 w-100 align-center' }, + standalone: true, + imports: [ + NgClass, + NgIf, + NgForOf, + NgOptimizedImage, + LoadingSpinnerComponent, + ], + animations: [ + trigger('messageChange', [ + transition('* => *', [ + style({ opacity: 0, transform: 'translateY(-10px)' }), + animate('300ms ease-out', style({ opacity: 1, transform: 'translateY(0)' })), + ]), + ]), + ], }) export class WebNodeInitializationComponent extends StoreDispatcher implements OnInit, AfterViewInit { - protected readonly WebNodeStepStatus = WebNodeStepStatus; - readonly loading: WebNodeLoadingStep[] = [ - { name: 'Setting up browser for Web Node', loaded: false, status: WebNodeStepStatus.LOADING }, - { name: 'Getting ready to produce blocks', loaded: false, status: WebNodeStepStatus.PENDING }, - { name: 'Connecting directly to Mina network', loaded: false, status: WebNodeStepStatus.PENDING }, - ]; - loadingMessage: string = ''; - ready: boolean = false; - hasError: boolean = false; - hasWarn: boolean = false; - errors: string[] = []; - - private stepsPercentages: number[]; - private secondStepInterval: any; - private thirdStepInterval: any; - private progress: number = 0; - private svg: any; - private progressBar: any; - private arc: any; - @ViewChild('progress', { static: true }) private chartContainer: ElementRef; - - constructor(private errorHandler: GlobalErrorHandlerService, - private webNodeService: WebNodeService, - private router: Router) { super(); } - - ngOnInit(): void { - window.dispatchEvent(new CustomEvent('startWebNode')); - any(window).testtest = []; - this.stepsPercentages = this.getStepPercentages(); - this.fetchProgress(); - this.listenToErrorIssuing(); - this.checkWebNodeProgress(); - this.fetchPeersInformation(); - } - - ngAfterViewInit(): void { - this.buildProgressBar(); - } - - private checkWebNodeProgress(): void { - this.webNodeService.webnodeProgress$.pipe(untilDestroyed(this)).subscribe((state: string) => { - if (state === 'Loaded') { - this.updateLoadingMessage('~5 seconds left'); - setTimeout(() => { - if (!this.hasError && this.loading[1].status !== WebNodeStepStatus.DONE) { - this.updateLoadingMessage('Slower than usual'); - this.hasWarn = true; - this.detect(); - } - }, 5000); - this.loading[0].loaded = true; - this.loading[0].status = WebNodeStepStatus.DONE; - this.loading[1].status = WebNodeStepStatus.LOADING; - this.advanceProgressFor2ndStep(); - } else if (state === 'Started') { - this.updateLoadingMessage('~2 seconds left'); - setTimeout(() => { - if (!this.hasError && this.loading[2].status !== WebNodeStepStatus.DONE) { - this.updateLoadingMessage('Slower than usual'); - this.hasWarn = true; - this.detect(); - } - }, 2000); - clearInterval(this.secondStepInterval); - this.loading[0].loaded = true; - this.loading[1].loaded = true; - this.loading[0].status = WebNodeStepStatus.DONE; - this.loading[1].status = WebNodeStepStatus.DONE; - this.loading[2].status = WebNodeStepStatus.LOADING; - this.advanceProgressFor3rdStep(); - } else if (state === 'Connected') { - this.updateLoadingMessage('Web Node is ready'); - clearInterval(this.thirdStepInterval); - this.loading[0].status = WebNodeStepStatus.DONE; - this.loading[1].status = WebNodeStepStatus.DONE; - this.loading[2].status = WebNodeStepStatus.DONE; - this.loading.forEach((step: WebNodeLoadingStep) => step.loaded = true); - this.goToEndProgress(); - } - this.detect(); - }); - } - - private getStepPercentages(): number[] { - // random between 65 and 80 - const first = Math.floor(Math.random() * 15) + 65; - // random between 15 and 17 - const second = Math.floor(Math.random() * 2) + 15; - const third = 100 - first - second; - return [first, second, third]; - } - - private advanceProgressFor2ndStep(): void { - // first step is done, now we are working on the second step. - // each second add 1% to the progress. - // but the second step is only 10% of the total progress. - // so never go above 10%. Stop at 9% if the second step is not done yet. - let progress = 0; - this.secondStepInterval = setInterval(() => { - if (progress < this.stepsPercentages[1] - 1) { - progress += 0.125; - this.updateProgressBar(this.stepsPercentages[0] + progress); - } - }, 75); - } - - private async advanceProgressFor3rdStep(): Promise { - // second step is done, now we are working on the third step. - // each second add 1% to the progress. - // but the third step is only 10% of the total progress. - // so never go above 10%. Stop at 9% if the third step is not done yet. - - const currentProgress = this.progress; - const targetProgress = this.stepsPercentages[0] + this.stepsPercentages[1] - 1; - // run fast 5 increments to reach the target progress - const diff = targetProgress - currentProgress; - - for (let i = 0; i < diff; i++) { - await new Promise(resolve => setTimeout(resolve, 25)); - this.updateProgressBar(currentProgress + i); - this.detect(); - } - - let progress = 0; - this.thirdStepInterval = setInterval(() => { - if (progress < this.stepsPercentages[2] - 1) { - progress += 0.125; - this.updateProgressBar(this.stepsPercentages[0] + this.stepsPercentages[1] + progress); - } - }, 75); - } - - private goToEndProgress(): void { - // increase it to 100% to make sure it's done. - // make it smooth, do a lot of increases from where it left - // to make it look like it's finishing. - - let progress = this.progress; - let interval = setInterval(() => { - if (progress <= 100) { - progress += 1; - this.updateProgressBar(progress); - } else { - clearInterval(interval); - } - }, 30); - } - - private fetchPeersInformation(): void { - timer(0, 1000).pipe( - switchMap(() => this.webNodeService.peers$), - untilDestroyed(this), - ).subscribe(); - } - - private updateLoadingMessage(message: string): void { - if (this.hasError || this.hasWarn) { - return; - } - this.loadingMessage = message; - } - - private listenToErrorIssuing(): void { - this.errorHandler.errors$ - .pipe(filter(errors => !!errors.length), untilDestroyed(this)) - .subscribe((error: string) => { - this.errors.push(error); - this.loadingMessage = error; - this.hasError = true; - this.markErrorOnD3(); - - this.detect(); - }); - } - - private fetchProgress(): void { - FileProgressHelper.progress$.pipe( - filter(Boolean), - untilDestroyed(this), - ).subscribe((progress) => { - this.loadingMessage = `Downloading ${(progress.downloaded / 1e6).toFixed(1)} of ${(progress.totalSize / 1e6).toFixed(1)} MB`; - if (this.svg) { - const totalProgress = (progress.progress * this.stepsPercentages[0]) / 100; - this.updateProgressBar(totalProgress); - } - this.detect(); - }); - } - - goToDashboard(): void { - if (!this.ready) { - return; - } - this.router.navigate([getFirstFeature()]); - } - - private buildProgressBar(): void { - const width = this.chartContainer.nativeElement.offsetWidth; - const height = this.chartContainer.nativeElement.offsetHeight; - const barWidth = 4; - const progress = 0; - - this.svg = d3 - .select(this.chartContainer.nativeElement) - .append('svg') - .attr('width', width) - .attr('height', height); - - this.progressBar = this.svg.append('g') - .attr('transform', `translate(${width / 2}, ${height / 2})`); - - const radius = Math.min(width, height) / 2 - barWidth; - - this.progressBar.append('circle') - .attr('r', radius) - .attr('fill', 'none') - .attr('stroke', 'var(--base-tertiary2)') - .attr('stroke-width', 1); - - this.arc = d3.arc() - .innerRadius(radius - barWidth) - .outerRadius(radius) - .startAngle(0) - .endAngle(Math.PI * 2 * (progress / 100)); - - this.progressBar.append('path') - .attr('d', this.arc) - .attr('opacity', 0.8) - .attr('fill', 'url(#progress-gradient)'); - - const defs = this.svg.append('defs'); - const gradient = defs.append('linearGradient') - .attr('id', 'progress-gradient') - .attr('x1', '0%') - .attr('x2', '75%') - .attr('y1', '25%') - .attr('y2', '0%'); - - gradient.append('stop') - .attr('offset', '8%') - .attr('stop-color', '#57d7ff'); - gradient.append('stop') - .attr('offset', '60%') - .attr('stop-color', '#fda2ff'); - gradient.append('stop') - .attr('offset', '100%') - .attr('stop-color', '#ff833d'); - - this.progressBar.append('text') - .attr('text-anchor', 'middle') - .attr('alignment-baseline', 'central') - .attr('dominant-baseline', 'central') - .attr('font-size', '40px') - .attr('fill', 'var(--base-primary)') - .attr('opacity', 0.8) - .attr('dx', '-.2em') - .text((progress).toFixed(0)); - this.progressBar.append('text') - .attr('class', 'symbol') - .attr('text-anchor', 'middle') - .attr('alignment-baseline', 'central') - .attr('dominant-baseline', 'central') - .attr('font-size', '20px') - .attr('fill', 'var(--base-tertiary)') - .attr('opacity', 0.8) - .attr('dy', '-.3em') - .attr('dx', '1.5em') - .text('%'); - } - - private updateProgressBar(newProgress: number): void { - any(window).testtest.push(newProgress); - if (newProgress >= 100) { - this.ready = true; - newProgress = 100; - this.detect(); - } - this.progress = newProgress; - this.arc.endAngle(Math.PI * 2 * (newProgress / 100)); - this.progressBar - .select('path') - .attr('d', this.arc); - this.progressBar - .select('text') - .text((newProgress).toFixed(0)); - const numberOfDigits = newProgress.toFixed(0).length + 1; - this.progressBar.select('.symbol') - .attr('dx', `${numberOfDigits * 0.45}em`) - .text('%'); - } - - private markErrorOnD3(): void { - this.progressBar.select('path').attr('fill', 'var(--warn-primary)'); - this.progressBar.select('text').attr('fill', 'var(--warn-primary)'); - this.progressBar.select('.symbol').attr('fill', 'var(--warn-primary)'); - this.progressBar.select('path').attr('opacity', 0.4); - this.progressBar.select('text').attr('opacity', 0.8); - this.progressBar.select('.symbol').attr('opacity', 0.4); - } + protected readonly WebNodeStepStatus = WebNodeStepStatus; + readonly loading: WebNodeLoadingStep[] = [ + { name: 'Setting up browser for Web Node', loaded: false, status: WebNodeStepStatus.LOADING }, + { name: 'Getting ready to produce blocks', loaded: false, status: WebNodeStepStatus.PENDING }, + { name: 'Connecting directly to Mina network', loaded: false, status: WebNodeStepStatus.PENDING }, + ]; + loadingMessage: string = ''; + downloadingMessage: string = ''; + ready: boolean = false; + hasError: boolean = false; + hasWarn: boolean = false; + errors: string[] = []; + + private stepsPercentages: number[]; + private secondStepInterval: any; + private thirdStepInterval: any; + private progress: number = 0; + private svg: any; + private progressBar: any; + private arc: any; + @ViewChild('progress', { static: true }) private chartContainer: ElementRef; + + constructor(private errorHandler: GlobalErrorHandlerService, + private webNodeService: WebNodeService, + private router: Router) { super(); } + + ngOnInit(): void { + window.dispatchEvent(new CustomEvent('startWebNode')); + any(window).testtest = []; + this.stepsPercentages = this.getStepPercentages(); + this.fetchProgress(); + this.listenToErrorIssuing(); + this.checkWebNodeProgress(); + this.fetchPeersInformation(); + } + + ngAfterViewInit(): void { + this.buildProgressBar(); + } + + private checkWebNodeProgress(): void { + this.webNodeService.webnodeProgress$.pipe(untilDestroyed(this)).subscribe((state: string) => { + if (state === 'Loaded') { + this.updateLoadingMessage('~5 seconds left'); + setTimeout(() => { + if (!this.hasError && this.loading[1].status !== WebNodeStepStatus.DONE) { + this.updateLoadingMessage('Slower than usual'); + this.hasWarn = true; + this.detect(); + } + }, 5000); + this.loading[0].loaded = true; + this.loading[0].status = WebNodeStepStatus.DONE; + this.loading[1].status = WebNodeStepStatus.LOADING; + this.advanceProgressFor2ndStep(); + } else if (state === 'Started') { + this.updateLoadingMessage('~2 seconds left'); + setTimeout(() => { + if (!this.hasError && this.loading[2].status !== WebNodeStepStatus.DONE) { + this.updateLoadingMessage('Slower than usual'); + this.hasWarn = true; + this.detect(); + } + }, 2000); + clearInterval(this.secondStepInterval); + this.loading[0].loaded = true; + this.loading[1].loaded = true; + this.loading[0].status = WebNodeStepStatus.DONE; + this.loading[1].status = WebNodeStepStatus.DONE; + this.loading[2].status = WebNodeStepStatus.LOADING; + this.advanceProgressFor3rdStep(); + } else if (state === 'Connected') { + this.updateLoadingMessage('Web Node is ready'); + clearInterval(this.thirdStepInterval); + this.loading[0].status = WebNodeStepStatus.DONE; + this.loading[1].status = WebNodeStepStatus.DONE; + this.loading[2].status = WebNodeStepStatus.DONE; + this.loading.forEach((step: WebNodeLoadingStep) => step.loaded = true); + this.goToEndProgress(); + } + this.detect(); + }); + } + + private getStepPercentages(): number[] { + // random between 65 and 80 + const first = Math.floor(Math.random() * 15) + 65; + // random between 15 and 17 + const second = Math.floor(Math.random() * 2) + 15; + const third = 100 - first - second; + return [first, second, third]; + } + + private advanceProgressFor2ndStep(): void { + // first step is done, now we are working on the second step. + // each second add 1% to the progress. + // but the second step is only 10% of the total progress. + // so never go above 10%. Stop at 9% if the second step is not done yet. + let progress = 0; + this.secondStepInterval = setInterval(() => { + if (progress < this.stepsPercentages[1] - 1) { + progress += 0.125; + this.updateProgressBar(this.stepsPercentages[0] + progress); + } + }, 75); + } + + private async advanceProgressFor3rdStep(): Promise { + // second step is done, now we are working on the third step. + // each second add 1% to the progress. + // but the third step is only 10% of the total progress. + // so never go above 10%. Stop at 9% if the third step is not done yet. + + const currentProgress = this.progress; + const targetProgress = this.stepsPercentages[0] + this.stepsPercentages[1] - 1; + // run fast 5 increments to reach the target progress + const diff = targetProgress - currentProgress; + + for (let i = 0; i < diff; i++) { + await new Promise(resolve => setTimeout(resolve, 25)); + this.updateProgressBar(currentProgress + i); + this.detect(); + } + + let progress = 0; + this.thirdStepInterval = setInterval(() => { + if (progress < this.stepsPercentages[2] - 1) { + progress += 0.125; + this.updateProgressBar(this.stepsPercentages[0] + this.stepsPercentages[1] + progress); + } + }, 75); + } + + private goToEndProgress(): void { + // increase it to 100% to make sure it's done. + // make it smooth, do a lot of increases from where it left + // to make it look like it's finishing. + + let progress = this.progress; + let interval = setInterval(() => { + if (progress <= 100) { + progress += 1; + this.updateProgressBar(progress); + } else { + clearInterval(interval); + } + }, 30); + } + + private fetchPeersInformation(): void { + timer(0, 1000).pipe( + switchMap(() => this.webNodeService.peers$), + untilDestroyed(this), + ).subscribe(); + } + + private updateLoadingMessage(message: string): void { + if (this.hasError || this.hasWarn) { + return; + } + this.loadingMessage = message; + } + + private listenToErrorIssuing(): void { + this.errorHandler.errors$ + .pipe(filter(errors => !!errors.length), untilDestroyed(this)) + .subscribe((error: string) => { + this.errors.push(error); + this.loadingMessage = error; + this.hasError = true; + this.markErrorOnD3(); + + this.detect(); + }); + } + + private fetchProgress(): void { + FileProgressHelper.progress$.pipe( + filter(Boolean), + untilDestroyed(this), + ).subscribe((progress) => { + this.downloadingMessage = `Downloading ${(progress.downloaded / 1e6).toFixed(1)} of ${(progress.totalSize / 1e6).toFixed(1)} MB`; + if (this.svg) { + const totalProgress = (progress.progress * this.stepsPercentages[0]) / 100; + this.updateProgressBar(totalProgress); + } + this.detect(); + }); + } + + goToDashboard(): void { + if (!this.ready) { + return; + } + this.router.navigate([getFirstFeature()]); + } + + private buildProgressBar(): void { + const width = this.chartContainer.nativeElement.offsetWidth; + const height = this.chartContainer.nativeElement.offsetHeight; + const barWidth = 4; + const progress = 0; + + this.svg = d3 + .select(this.chartContainer.nativeElement) + .append('svg') + .attr('width', width) + .attr('height', height); + + this.progressBar = this.svg.append('g') + .attr('transform', `translate(${width / 2}, ${height / 2})`); + + const radius = Math.min(width, height) / 2 - barWidth; + + this.progressBar.append('circle') + .attr('r', radius) + .attr('fill', 'none') + .attr('stroke', 'var(--base-tertiary2)') + .attr('stroke-width', 1); + + this.arc = d3.arc() + .innerRadius(radius - barWidth) + .outerRadius(radius) + .startAngle(0) + .endAngle(Math.PI * 2 * (progress / 100)); + + this.progressBar.append('path') + .attr('d', this.arc) + .attr('opacity', 0.8) + .attr('fill', 'url(#progress-gradient)'); + + const defs = this.svg.append('defs'); + const gradient = defs.append('linearGradient') + .attr('id', 'progress-gradient') + .attr('x1', '0%') + .attr('x2', '75%') + .attr('y1', '25%') + .attr('y2', '0%'); + + gradient.append('stop') + .attr('offset', '8%') + .attr('stop-color', '#57d7ff'); + gradient.append('stop') + .attr('offset', '60%') + .attr('stop-color', '#fda2ff'); + gradient.append('stop') + .attr('offset', '100%') + .attr('stop-color', '#ff833d'); + + this.progressBar.append('text') + .attr('text-anchor', 'middle') + .attr('alignment-baseline', 'central') + .attr('dominant-baseline', 'central') + .attr('font-size', '40px') + .attr('fill', 'var(--base-primary)') + .attr('opacity', 0.8) + .attr('dx', '-.2em') + .text((progress).toFixed(0)); + this.progressBar.append('text') + .attr('class', 'symbol') + .attr('text-anchor', 'middle') + .attr('alignment-baseline', 'central') + .attr('dominant-baseline', 'central') + .attr('font-size', '20px') + .attr('fill', 'var(--base-tertiary)') + .attr('opacity', 0.8) + .attr('dy', '-.3em') + .attr('dx', '1.5em') + .text('%'); + } + + private updateProgressBar(newProgress: number): void { + any(window).testtest.push(newProgress); + if (newProgress >= 100) { + this.ready = true; + newProgress = 100; + this.detect(); + } + this.progress = newProgress; + this.arc.endAngle(Math.PI * 2 * (newProgress / 100)); + this.progressBar + .select('path') + .attr('d', this.arc); + this.progressBar + .select('text') + .text((newProgress).toFixed(0)); + const numberOfDigits = newProgress.toFixed(0).length + 1; + this.progressBar.select('.symbol') + .attr('dx', `${numberOfDigits * 0.45}em`) + .text('%'); + } + + private markErrorOnD3(): void { + this.progressBar.select('path').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('text').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('.symbol').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('path').attr('opacity', 0.4); + this.progressBar.select('text').attr('opacity', 0.8); + this.progressBar.select('.symbol').attr('opacity', 0.4); + } } From a2055bc375d2a23226b8b33cd2bf39b79b0dec16 Mon Sep 17 00:00:00 2001 From: Mimir Date: Mon, 11 Nov 2024 14:06:55 +0100 Subject: [PATCH 035/175] Added disconnect for all connections --- .../p2p_disconnection_reducer.rs | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/p2p/src/disconnection/p2p_disconnection_reducer.rs b/p2p/src/disconnection/p2p_disconnection_reducer.rs index 9b4e55860f..761205ddbc 100644 --- a/p2p/src/disconnection/p2p_disconnection_reducer.rs +++ b/p2p/src/disconnection/p2p_disconnection_reducer.rs @@ -24,23 +24,30 @@ impl P2pDisconnectedState { P2pDisconnectionAction::Init { peer_id, reason } => { #[cfg(feature = "p2p-libp2p")] if p2p_state.is_libp2p_peer(&peer_id) { - if let Some((&addr, _)) = p2p_state + let connections = p2p_state .network .scheduler .connections .iter() - .find(|(_, conn_state)| conn_state.peer_id() == Some(&peer_id)) - { - let Some(peer) = p2p_state.peers.get_mut(&peer_id) else { - bug_condition!("Invalid state for: `P2pDisconnectionAction::Finish`"); - return Ok(()); - }; - peer.status = P2pPeerStatus::Disconnecting { time: meta.time() }; + .filter(|(_, conn_state)| conn_state.peer_id() == Some(&peer_id)) + .map(|(addr, _)| *addr) + .collect::>(); - let dispatcher = state_context.into_dispatcher(); - dispatcher.push(P2pNetworkSchedulerAction::Disconnect { addr, reason }); - dispatcher.push(P2pDisconnectionAction::Finish { peer_id }); + let Some(peer) = p2p_state.peers.get_mut(&peer_id) else { + bug_condition!("Invalid state for: `P2pDisconnectionAction::Finish`"); + return Ok(()); + }; + peer.status = P2pPeerStatus::Disconnecting { time: meta.time() }; + + let dispatcher = state_context.into_dispatcher(); + for addr in connections { + dispatcher.push(P2pNetworkSchedulerAction::Disconnect { + addr, + reason: reason.clone(), + }); } + + dispatcher.push(P2pDisconnectionAction::Finish { peer_id }); return Ok(()); } From d24aa09c52c65c21dbaf00d65e992a9e983297ce Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:13:36 +0200 Subject: [PATCH 036/175] Frontend - Web node not supported screen (#885) --- frontend/src/app/app.module.ts | 3 + .../web-node-not-supported.component.html | 60 +++++++++++++++++++ .../web-node-not-supported.component.scss | 45 ++++++++++++++ .../web-node-not-supported.component.ts | 14 +++++ .../features/webnode/webnode.component.html | 6 +- .../app/features/webnode/webnode.component.ts | 30 +++++++++- .../assets/images/web-node-demo/android.svg | 23 +++++++ .../assets/images/web-node-demo/chrome.svg | 26 ++++++++ .../src/assets/images/web-node-demo/edge.svg | 46 ++++++++++++++ .../src/assets/images/web-node-demo/macos.svg | 10 ++++ .../assets/images/web-node-demo/safari.svg | 42 +++++++++++++ .../assets/images/web-node-demo/windows.svg | 10 ++++ frontend/src/index.html | 28 +++++---- 13 files changed, 327 insertions(+), 16 deletions(-) create mode 100644 frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html create mode 100644 frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss create mode 100644 frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts create mode 100644 frontend/src/assets/images/web-node-demo/android.svg create mode 100644 frontend/src/assets/images/web-node-demo/chrome.svg create mode 100644 frontend/src/assets/images/web-node-demo/edge.svg create mode 100644 frontend/src/assets/images/web-node-demo/macos.svg create mode 100644 frontend/src/assets/images/web-node-demo/safari.svg create mode 100644 frontend/src/assets/images/web-node-demo/windows.svg diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 7b92070751..322a443d48 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -110,6 +110,9 @@ export class AppGlobalErrorhandler implements ErrorHandler { handleError(error: any): void { Sentry.captureException(error); + if (typeof error === 'string') { + error = new Error(error); + } this.errorHandlerService.handleError(error); } } diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html new file mode 100644 index 0000000000..4dca3c9465 --- /dev/null +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html @@ -0,0 +1,60 @@ +
+ +
+@if (isPhone) { +
+
+
Your device isn't supported
+
+ Unfortunately, iOS devices are not currently supported. +
+
+ +
+
Switch to one of the following platforms
+
+
+ + Windows +
+
+ + Android +
+
+ + MacOS +
+
+
+ +
And use Chrome, Edge or Safari
+
+} @else { +
+
+
Your browser isn't supported
+
+
To run a Mina node in your browser,
+
we recommend Chrome or similar.
+
+
+ +
+
+
+ + Chrome +
+
+ + Safari +
+
+ + Edge +
+
+
+
+} diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss new file mode 100644 index 0000000000..82eeb41224 --- /dev/null +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss @@ -0,0 +1,45 @@ +.header { + height: 56px; + + .mina-svg { + height: 32px; + } +} + +.phone-content, +.browser-content { + height: calc(100% - 56px); + + .headline { + font-size: 20px; + line-height: 30px; + margin-bottom: 8px; + } + + .img-wrapper { + margin-top: 24px; + gap: 30px; + } + + img { + height: 44px; + width: 44px; + } + + .sub-headline { + font-size: 16px; + } + + .browser { + margin-top: 64px; + } +} + +.browser-content { + max-width: 600px; + + img { + height: 56px; + width: 56px; + } +} diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts new file mode 100644 index 0000000000..905b24bd30 --- /dev/null +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts @@ -0,0 +1,14 @@ +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; + +@Component({ + selector: 'mina-web-node-not-supported', + standalone: true, + imports: [], + templateUrl: './web-node-not-supported.component.html', + styleUrl: './web-node-not-supported.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'h-100 flex-column align-center' }, +}) +export class WebNodeNotSupportedComponent { + @Input() isPhone!: boolean; +} diff --git a/frontend/src/app/features/webnode/webnode.component.html b/frontend/src/app/features/webnode/webnode.component.html index d8370a7d76..d01339f4b8 100644 --- a/frontend/src/app/features/webnode/webnode.component.html +++ b/frontend/src/app/features/webnode/webnode.component.html @@ -1 +1,5 @@ - +@if (supported) { + +} @else { + +} diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index fbd8210c2f..cb3dc01f72 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -1,16 +1,42 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { WebNodeInitializationComponent } from '@app/features/webnode/web-node-initialization/web-node-initialization.component'; +import { Platform } from '@angular/cdk/platform'; +import { WebNodeNotSupportedComponent } from '@app/features/webnode/web-node-not-supported/web-node-not-supported.component'; @Component({ selector: 'mina-webnode', standalone: true, imports: [ WebNodeInitializationComponent, + WebNodeNotSupportedComponent, ], templateUrl: './webnode.component.html', styleUrl: './webnode.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class WebnodeComponent { +export class WebnodeComponent implements OnInit { + supported: boolean = false; + isPhone: boolean = false; + + constructor(private platform: Platform) {} + + ngOnInit(): void { + this.checkIfDeviceIsSupported(); + } + + private checkIfDeviceIsSupported(): void { + if (this.platform.IOS) { + this.supported = false; + this.isPhone = true; + return; + } + + if (this.platform.FIREFOX || this.platform.BLINK) { + this.supported = false; + return; + } + + this.supported = true; + } } diff --git a/frontend/src/assets/images/web-node-demo/android.svg b/frontend/src/assets/images/web-node-demo/android.svg new file mode 100644 index 0000000000..6633ec161e --- /dev/null +++ b/frontend/src/assets/images/web-node-demo/android.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/images/web-node-demo/chrome.svg b/frontend/src/assets/images/web-node-demo/chrome.svg new file mode 100644 index 0000000000..bda269e4ba --- /dev/null +++ b/frontend/src/assets/images/web-node-demo/chrome.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/images/web-node-demo/edge.svg b/frontend/src/assets/images/web-node-demo/edge.svg new file mode 100644 index 0000000000..d3141091dc --- /dev/null +++ b/frontend/src/assets/images/web-node-demo/edge.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/images/web-node-demo/macos.svg b/frontend/src/assets/images/web-node-demo/macos.svg new file mode 100644 index 0000000000..13de47be23 --- /dev/null +++ b/frontend/src/assets/images/web-node-demo/macos.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/frontend/src/assets/images/web-node-demo/safari.svg b/frontend/src/assets/images/web-node-demo/safari.svg new file mode 100644 index 0000000000..7692f8674c --- /dev/null +++ b/frontend/src/assets/images/web-node-demo/safari.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/images/web-node-demo/windows.svg b/frontend/src/assets/images/web-node-demo/windows.svg new file mode 100644 index 0000000000..cc42207007 --- /dev/null +++ b/frontend/src/assets/images/web-node-demo/windows.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/frontend/src/index.html b/frontend/src/index.html index 03a41c34af..491d401407 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -2,16 +2,25 @@ + @@ -31,13 +40,6 @@ - From c575d142bf54be1e7fac0f89c9746a0f03370eec Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:25:58 +0200 Subject: [PATCH 037/175] Frontend - support Chrome (#886) --- frontend/src/app/features/webnode/webnode.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index cb3dc01f72..fd4318ac5c 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -32,7 +32,7 @@ export class WebnodeComponent implements OnInit { return; } - if (this.platform.FIREFOX || this.platform.BLINK) { + if (this.platform.FIREFOX) { this.supported = false; return; } From 71aead32c2bbfae0e52bb47a38f431d84c9508cc Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 11 Nov 2024 19:02:53 -0300 Subject: [PATCH 038/175] chore: Update hardcoded peer id for the signaling server --- node/web/src/node/builder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/web/src/node/builder.rs b/node/web/src/node/builder.rs index b9e93beac6..c9270a7a45 100644 --- a/node/web/src/node/builder.rs +++ b/node/web/src/node/builder.rs @@ -277,7 +277,7 @@ impl NodeBuilder { } fn default_peers() -> Vec { - ["/2cBFzmUmkYgMUrxdv5S2Udyv8eiuhokAFS4WnYfHiAJLWoQ3yL9/https/webrtc3.webnode.openmina.com/443"] + ["/2bjYBqn45MmtismsAYP9rZ6Xns9snCcNsN1eDgQZB5s6AzY2CR2/https/webrtc3.webnode.openmina.com/443"] .into_iter() .map(|s| s.parse().unwrap()) .collect() From 04ad772e5ad176d08d0ab511a76a60a6581b749d Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:05:53 +0200 Subject: [PATCH 039/175] Frontend - Webnode Caching mechanism (#889) --- frontend/docker/startup.sh | 18 +++++++++++++++++- frontend/httpd.conf | 9 +++------ .../src/app/core/services/web-node.service.ts | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/frontend/docker/startup.sh b/frontend/docker/startup.sh index 19b2629a10..61a0882c38 100644 --- a/frontend/docker/startup.sh +++ b/frontend/docker/startup.sh @@ -105,7 +105,8 @@ download_wasm_files() { # Inject caching logic into openmina_node_web.js OPENMINA_JS="$TARGET_DIR/openmina_node_web.js" - inject_caching_logic "$OPENMINA_JS" + INDEX_HTML="/usr/local/apache2/htdocs/index.html" + inject_caching_logic "$OPENMINA_JS" "$INDEX_HTML" fi fi @@ -114,13 +115,28 @@ download_wasm_files() { inject_caching_logic() { local js_file="$1" + local index_html="$2" if [ -f "$js_file" ]; then echo "Injecting caching logic into $js_file" # Generate a unique hash local hash=$(openssl rand -hex 8) + # replace openmina_node_web_bg.wasm with openmina_node_web_bg.$hash.wasm + sed -i "s/openmina_node_web_bg.wasm/openmina_node_web_bg.$hash.wasm/g" "$js_file" + + # add cache headers to fetch calls sed -i 's/module_or_path = fetch(module_or_path);/module_or_path = fetch(module_or_path, { cache: "force-cache", headers: { "Cache-Control": "max-age=31536000, immutable" } });/' "$js_file" + + # rename openmina_node_web_bg.wasm to openmina_node_web_bg.$hash.wasm + mv "$TARGET_DIR/openmina_node_web_bg.wasm" "$TARGET_DIR/openmina_node_web_bg.$hash.wasm" + + # rename openmina_node_web.js to openmina_node_web.$hash.js + mv "$TARGET_DIR/openmina_node_web.js" "$TARGET_DIR/openmina_node_web.$hash.js" + + # replace openmina_node_web.js with openmina_node_web.$hash.js in index.html + sed -i "s/openmina_node_web.js/openmina_node_web.$hash.js/g" "$index_html" + if [[ $? -ne 0 ]]; then echo "Failed to inject caching logic into $js_file" else diff --git a/frontend/httpd.conf b/frontend/httpd.conf index c294365780..5cd1d4b0a8 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -229,13 +229,10 @@ SSLProxyEngine On -# Cache rules for WebNode assets - +# Cache rules + Header set Cache-Control "public, max-age=31536000, immutable" - - - Header set Cache-Control "public, max-age=31536000, immutable" - + # Make sure mod_headers is enabled diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index 58430ccf3a..2457c01638 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -54,7 +54,7 @@ export class WebNodeService { startWasm$(): Observable { return of(any(window).webnode) .pipe( - switchMap((wasm: any) => from(wasm.default('assets/webnode/pkg/openmina_node_web_bg.wasm')).pipe(map(() => wasm))), + switchMap((wasm: any) => from(wasm.default()).pipe(map(() => wasm))), switchMap((wasm) => { this.webnodeProgress$.next('Loaded'); return from(wasm.run(this.webNodeKeyPair.privateKey)); From d53930387fa6df70329756ef6c88cc790fb12abb Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 12 Nov 2024 12:16:01 +0100 Subject: [PATCH 040/175] Ledger: use eval pt name instead of fst and snd Initially, it was used to reflect the OCaml code in `src/lib/pickles/plonk_checks`. However, I do think we have to change that as it makes the code more readable from a cryptography point of view. --- .../src/proofs/public_input/plonk_checks.rs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ledger/src/proofs/public_input/plonk_checks.rs b/ledger/src/proofs/public_input/plonk_checks.rs index ea34e8f0ab..acf4098b95 100644 --- a/ledger/src/proofs/public_input/plonk_checks.rs +++ b/ledger/src/proofs/public_input/plonk_checks.rs @@ -253,15 +253,15 @@ pub fn derive_plonk( let zkp = env.zk_polynomial; let powers_of_alpha = powers_of_alpha(*alpha); let alpha_pow = |i: usize| powers_of_alpha[i]; - let w0 = evals.w.map(|point| point.fst()); + let w0 = evals.w.map(|point| point.zeta); let beta = *beta; let gamma = *gamma; // https://github.com/MinaProtocol/mina/blob/0b63498e271575dbffe2b31f3ab8be293490b1ac/src/lib/pickles/plonk_checks/plonk_checks.ml#L397 let perm = evals.s.iter().enumerate().fold( - evals.z.snd() * beta * alpha_pow(PERM_ALPHA0) * zkp, - |accum, (index, elem)| accum * (gamma + (beta * elem.fst()) + w0[index]), + evals.z.zeta_omega * beta * alpha_pow(PERM_ALPHA0) * zkp, + |accum, (index, elem)| accum * (gamma + (beta * elem.zeta) + w0[index]), ); let perm = -perm; @@ -302,16 +302,16 @@ pub fn derive_plonk_checked( let zkp = env.zk_polynomial; let powers_of_alpha = powers_of_alpha(minimal.alpha); let alpha_pow = |i: usize| powers_of_alpha[i]; - let w0 = evals.w.map(|point| point.fst()); + let w0 = evals.w.map(|point| point.zeta); let beta = minimal.beta; let gamma = minimal.gamma; let perm = evals.s.iter().enumerate().fold( - field::muls(&[evals.z.snd(), beta, alpha_pow(PERM_ALPHA0), zkp], w), + field::muls(&[evals.z.zeta_omega, beta, alpha_pow(PERM_ALPHA0), zkp], w), |accum, (index, elem)| { // We decompose this way because of OCaml evaluation order - let beta_elem = field::mul(beta, elem.fst(), w); + let beta_elem = field::mul(beta, elem.zeta, w); field::mul(accum, gamma + beta_elem + w0[index], w) }, ); @@ -385,7 +385,7 @@ pub fn ft_eval0( ) -> F { const PLONK_TYPES_PERMUTS_MINUS_1_N: usize = 6; - let e0_s: Vec<_> = evals.s.iter().map(|s| s.fst()).collect(); + let e0_s: Vec<_> = evals.s.iter().map(|s| s.zeta).collect(); let zkp = env.zk_polynomial; let powers_of_alpha = powers_of_alpha(minimal.alpha); let alpha_pow = |i: usize| powers_of_alpha[i]; @@ -405,12 +405,12 @@ pub fn ft_eval0( }) .unwrap(); // Never fail, `p_eval0` is non-empty - let w0: Vec<_> = evals.w.iter().map(|w| w.fst()).collect(); + let w0: Vec<_> = evals.w.iter().map(|w| w.zeta).collect(); let ft_eval0 = { let a0 = alpha_pow(PERM_ALPHA0); let w_n = w0[PLONK_TYPES_PERMUTS_MINUS_1_N]; - let init = (w_n + minimal.gamma) * evals.z.snd() * a0 * zkp; + let init = (w_n + minimal.gamma) * evals.z.zeta_omega * a0 * zkp; e0_s.iter().enumerate().fold(init, |acc, (i, s)| { ((minimal.beta * s) + w0[i] + minimal.gamma) * acc }) @@ -421,14 +421,14 @@ pub fn ft_eval0( let ft_eval0 = ft_eval0 - shifts.iter().enumerate().fold( - alpha_pow(PERM_ALPHA0) * zkp * evals.z.fst(), + alpha_pow(PERM_ALPHA0) * zkp * evals.z.zeta, |acc, (i, s)| acc * (minimal.gamma + (minimal.beta * minimal.zeta * s) + w0[i]), ); let nominator = (zeta1m1 * alpha_pow(PERM_ALPHA0 + 1) * (minimal.zeta - env.omega_to_minus_zk_rows) + (zeta1m1 * alpha_pow(PERM_ALPHA0 + 2) * (minimal.zeta - F::one()))) - * (F::one() - evals.z.fst()); + * (F::one() - evals.z.zeta); let denominator = (minimal.zeta - env.omega_to_minus_zk_rows) * (minimal.zeta - F::one()); let ft_eval0 = ft_eval0 + (nominator / denominator); @@ -873,7 +873,7 @@ pub fn ft_eval0_checked( ) -> F { const PLONK_TYPES_PERMUTS_MINUS_1_N: usize = 6; - let e0_s: Vec<_> = evals.s.iter().map(|s| s.fst()).collect(); + let e0_s: Vec<_> = evals.s.iter().map(|s| s.zeta).collect(); let zkp = env.zk_polynomial; let powers_of_alpha = powers_of_alpha(minimal.alpha); let alpha_pow = |i: usize| powers_of_alpha[i]; @@ -890,12 +890,12 @@ pub fn ft_eval0_checked( } }) .unwrap(); // Never fail, `p_eval0` is non-empty - let w0: Vec<_> = evals.w.iter().map(|w| w.fst()).collect(); + let w0: Vec<_> = evals.w.iter().map(|w| w.zeta).collect(); let ft_eval0 = { let a0 = alpha_pow(PERM_ALPHA0); let w_n = w0[PLONK_TYPES_PERMUTS_MINUS_1_N]; - let init = field::muls(&[(w_n + minimal.gamma), evals.z.snd(), a0, zkp], w); + let init = field::muls(&[(w_n + minimal.gamma), evals.z.zeta_omega, a0, zkp], w); e0_s.iter().enumerate().fold(init, |acc, (i, s)| { // We decompose this way because of OCaml evaluation order let beta_s = field::mul(minimal.beta, *s, w); @@ -908,7 +908,7 @@ pub fn ft_eval0_checked( let ft_eval0 = ft_eval0 - shifts.iter().enumerate().fold( - field::muls(&[alpha_pow(PERM_ALPHA0), zkp, evals.z.fst()], w), + field::muls(&[alpha_pow(PERM_ALPHA0), zkp, evals.z.zeta], w), |acc, (i, s)| { let beta_zeta = field::mul(minimal.beta, minimal.zeta, w); field::mul(acc, minimal.gamma + (beta_zeta * s) + w0[i], w) @@ -932,7 +932,7 @@ pub fn ft_eval0_checked( ], w, ); - let nominator = field::mul(a + b, F::one() - evals.z.fst(), w); + let nominator = field::mul(a + b, F::one() - evals.z.zeta, w); let denominator = field::mul( minimal.zeta - env.omega_to_minus_zk_rows, From 61cd64aeb658cae758aba269ede238e1285d9f32 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:23:26 +0200 Subject: [PATCH 041/175] Frontend - Remove caching and add dev mode (#891) --- frontend/httpd.conf | 20 ++++++++++-- .../src/app/core/services/web-node.service.ts | 2 +- .../web-node-initialization.component.ts | 4 +-- .../web-node-not-supported.component.html | 23 ++++++++----- .../web-node-not-supported.component.ts | 32 ++++++++++++++++++- .../features/webnode/webnode.component.html | 2 +- .../src/app/shared/helpers/webnode.helper.ts | 5 +-- 7 files changed, 70 insertions(+), 18 deletions(-) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 5cd1d4b0a8..425d969b69 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -230,9 +230,23 @@ SSLProxyEngine On # Cache rules - - Header set Cache-Control "public, max-age=31536000, immutable" - + +# Add cache for web node files +; +; Header set Cache-Control "public, max-age=31536000, immutable" +; + +# REMOVE CACHE + + FileETag None + + Header unset ETag + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" + + + # Make sure mod_headers is enabled diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index 2457c01638..b2da5fc31c 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -101,7 +101,7 @@ export class WebNodeService { // } if (!this.sentryEvents.firstPeerConnected && peers.some((p: any) => p.connection_status === DashboardPeerStatus.CONNECTED)) { const seconds = (Date.now() - this.webNodeStartTime) / 1000; - sendSentryEvent(`WebNode connected in ${seconds.toFixed(1)}s`); + sendSentryEvent(`WebNode connected in ${seconds.toFixed(1)}s`, 'info'); this.sentryEvents.firstPeerConnected = true; this.webnodeProgress$.next('Connected'); } diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts index f926e3e6ef..cc65d098fd 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts @@ -105,14 +105,14 @@ export class WebNodeInitializationComponent extends StoreDispatcher implements O this.loading[1].status = WebNodeStepStatus.LOADING; this.advanceProgressFor2ndStep(); } else if (state === 'Started') { - this.updateLoadingMessage('~2 seconds left'); + this.updateLoadingMessage('~3 seconds left'); setTimeout(() => { if (!this.hasError && this.loading[2].status !== WebNodeStepStatus.DONE) { this.updateLoadingMessage('Slower than usual'); this.hasWarn = true; this.detect(); } - }, 2000); + }, 3500); clearInterval(this.secondStepInterval); this.loading[0].loaded = true; this.loading[1].loaded = true; diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html index 4dca3c9465..7fa84854eb 100644 --- a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html @@ -14,21 +14,21 @@
Switch to one of the following platforms
- + Windows
- + Android
- + MacOS
-
And use Chrome, Edge or Safari
+
And use Chrome, Edge, Safari or Brave
} @else {
@@ -36,25 +36,32 @@
Your browser isn't supported
To run a Mina node in your browser,
-
we recommend Chrome or similar.
+
we recommend one of the following.
- + Chrome
- + Safari
- + Edge
} +@if (devMode) { +
You entered Dev mode!
+
+ + +
+} diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts index 905b24bd30..df65c4988e 100644 --- a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts @@ -1,4 +1,8 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { Platform } from '@angular/cdk/platform'; +import { sendSentryEvent } from '@shared/helpers/webnode.helper'; + +const code = [1, 2, 3, 2]; @Component({ selector: 'mina-web-node-not-supported', @@ -10,5 +14,31 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; host: { class: 'h-100 flex-column align-center' }, }) export class WebNodeNotSupportedComponent { + @Input() isPhone!: boolean; + + @Output() bypassUnsupportedDevice = new EventEmitter(); + + devMode: boolean = false; + private codeVerifier: number[] = []; + + constructor(private platform: Platform) {} + + addDevKey(key: number): void { + this.codeVerifier.push(key); + if (this.codeVerifier.length === code.length) { + if (this.codeVerifier.every((v, i) => v === code[i])) { + this.devMode = true; + } else { + this.codeVerifier = []; + } + } + } + + c_hcK1_V_a_l_id(input: HTMLInputElement): void { + if (input.value === 'allowme') { + sendSentryEvent('A developer is testing the app on ' + this.platform, 'debug'); + this.bypassUnsupportedDevice.emit(); + } + } } diff --git a/frontend/src/app/features/webnode/webnode.component.html b/frontend/src/app/features/webnode/webnode.component.html index d01339f4b8..71207172ed 100644 --- a/frontend/src/app/features/webnode/webnode.component.html +++ b/frontend/src/app/features/webnode/webnode.component.html @@ -1,5 +1,5 @@ @if (supported) { } @else { - + } diff --git a/frontend/src/app/shared/helpers/webnode.helper.ts b/frontend/src/app/shared/helpers/webnode.helper.ts index 60d49ed541..7a223fb132 100644 --- a/frontend/src/app/shared/helpers/webnode.helper.ts +++ b/frontend/src/app/shared/helpers/webnode.helper.ts @@ -1,5 +1,6 @@ import * as Sentry from '@sentry/angular'; +import { SeverityLevel } from '@sentry/angular'; -export function sendSentryEvent(message: string): void { - Sentry.captureEvent({ message: message, tags: { type: 'webnode' } }); +export function sendSentryEvent(message: string, level: SeverityLevel = 'error'): void { + Sentry.captureEvent({ message: message, level, tags: { type: 'webnode' } }); } From d37b23898ce3ef9ef52d50f88dc454b315fe83bf Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:41:53 +0200 Subject: [PATCH 042/175] Frontend - Disable caching (#892) --- frontend/httpd.conf | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 425d969b69..155def3ca1 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -131,7 +131,7 @@ LoadModule log_config_module modules/mod_log_config.so LoadModule env_module modules/mod_env.so #LoadModule mime_magic_module modules/mod_mime_magic.so #LoadModule cern_meta_module modules/mod_cern_meta.so -#LoadModule expires_module modules/mod_expires.so +LoadModule expires_module modules/mod_expires.so LoadModule headers_module modules/mod_headers.so #LoadModule ident_module modules/mod_ident.so #LoadModule usertrack_module modules/mod_usertrack.so @@ -237,15 +237,27 @@ SSLProxyEngine On ; # REMOVE CACHE - - FileETag None - - Header unset ETag - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" - - + + ExpiresActive On + ExpiresByType text/html "access plus 0 seconds" + ExpiresByType text/htm "access plus 0 seconds" + ExpiresByType application/javascript "access plus 0 seconds" + ExpiresByType text/javascript "access plus 0 seconds" + ExpiresByType application/x-javascript "access plus 0 seconds" + ExpiresByType text/css "access plus 0 seconds" + ExpiresByType application/wasm "access plus 0 seconds" + ExpiresByType application/octet-stream "access plus 0 seconds" + ExpiresByType application/json "access plus 0 seconds" + ExpiresByType application/postcard "access plus 0 seconds" + ExpiresByType application/octet-stream "access plus 0 seconds" + + + + Header unset ETag + Header unset Last-Modified + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + # Make sure mod_headers is enabled From 87384a9c7a8f471d8172b6a074a09be797de1d31 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:00:37 +0200 Subject: [PATCH 043/175] Frontend - Caching syntax fix (#893) --- frontend/httpd.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 155def3ca1..9f8d55a106 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -231,11 +231,6 @@ SSLProxyEngine On # Cache rules -# Add cache for web node files -; -; Header set Cache-Control "public, max-age=31536000, immutable" -; - # REMOVE CACHE ExpiresActive On From bf423a3cdba283dcdf21a95afcc8e74683e30f90 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Tue, 12 Nov 2024 19:07:47 +0200 Subject: [PATCH 044/175] Frontend - Web node custom memory in URL (#894) --- frontend/src/app/app.component.ts | 6 ++++-- .../src/app/core/services/web-node.service.ts | 4 +++- .../app/features/webnode/webnode.component.ts | 19 +++++++++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 478554678c..1d90a99569 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -59,13 +59,15 @@ export class AppComponent extends StoreDispatcher implements OnInit { } goToWebNode(): void { - this.router.navigate([Routes.LOADING_WEB_NODE]); + this.router.navigate([Routes.LOADING_WEB_NODE], { queryParamsHandling: 'merge' }); this.initAppFunctionalities(); } private initAppFunctionalities(): void { if (this.webNodeService.hasWebNodeConfig() && !this.webNodeService.isWebNodeLoaded()) { - this.router.navigate([Routes.LOADING_WEB_NODE]); + if (!window.location.href.includes(`/${Routes.LOADING_WEB_NODE}`)) { + this.router.navigate([Routes.LOADING_WEB_NODE], { queryParamsHandling: 'preserve' }); + } } this.dispatch2(AppActions.init()); if (!this.hideToolbar && !CONFIG.hideNodeStats) { diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index b2da5fc31c..eedc2a5b27 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -20,6 +20,8 @@ export class WebNodeService { readonly webnodeProgress$: BehaviorSubject = new BehaviorSubject(''); + memory: WebAssembly.Memory; + constructor(private http: HttpClient) { FileProgressHelper.initDownloadProgress(); const basex = base('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'); @@ -54,7 +56,7 @@ export class WebNodeService { startWasm$(): Observable { return of(any(window).webnode) .pipe( - switchMap((wasm: any) => from(wasm.default()).pipe(map(() => wasm))), + switchMap((wasm: any) => from(wasm.default(undefined, this.memory)).pipe(map(() => wasm))), switchMap((wasm) => { this.webnodeProgress$.next('Loaded'); return from(wasm.run(this.webNodeKeyPair.privateKey)); diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index fd4318ac5c..91788ef97e 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -2,6 +2,10 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { WebNodeInitializationComponent } from '@app/features/webnode/web-node-initialization/web-node-initialization.component'; import { Platform } from '@angular/cdk/platform'; import { WebNodeNotSupportedComponent } from '@app/features/webnode/web-node-not-supported/web-node-not-supported.component'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { getMergedRoute, MergedRoute } from '@openmina/shared'; +import { filter } from 'rxjs'; +import { WebNodeService } from '@core/services/web-node.service'; @Component({ selector: 'mina-webnode', @@ -14,15 +18,26 @@ import { WebNodeNotSupportedComponent } from '@app/features/webnode/web-node-not styleUrl: './webnode.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class WebnodeComponent implements OnInit { +export class WebnodeComponent extends StoreDispatcher implements OnInit { supported: boolean = false; isPhone: boolean = false; - constructor(private platform: Platform) {} + constructor(private platform: Platform, + private webNodeService: WebNodeService) { super(); } ngOnInit(): void { this.checkIfDeviceIsSupported(); + this.listenToRoute(); + } + + private listenToRoute(): void { + this.select(getMergedRoute, (route: MergedRoute) => { + const initial = Number(route.queryParams['initial']); + const maximum = Number(route.queryParams['maximum']); + const shared = route.queryParams['shared'] === 'true'; + this.webNodeService.memory = new WebAssembly.Memory({ initial, maximum, shared }); + }, filter(Boolean)); } private checkIfDeviceIsSupported(): void { From cf41dfc7950179f7b6cda46d0635607675c7d554 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Tue, 12 Nov 2024 19:37:15 +0200 Subject: [PATCH 045/175] Frontend - improve memory from URL in web node loading screen (#895) --- .../src/app/features/webnode/webnode.component.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index 91788ef97e..39b05c6d00 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -33,9 +33,18 @@ export class WebnodeComponent extends StoreDispatcher implements OnInit { private listenToRoute(): void { this.select(getMergedRoute, (route: MergedRoute) => { - const initial = Number(route.queryParams['initial']); - const maximum = Number(route.queryParams['maximum']); - const shared = route.queryParams['shared'] === 'true'; + let initial = 174; + if (route.queryParams['initial']) { + initial = Number(route.queryParams['initial']); + } + let maximum = 65536; + if (route.queryParams['maximum']) { + maximum = Number(route.queryParams['maximum']); + } + let shared = true; + if (route.queryParams['shared']) { + shared = route.queryParams['shared'] === 'true'; + } this.webNodeService.memory = new WebAssembly.Memory({ initial, maximum, shared }); }, filter(Boolean)); } From eedd27ba64fd81d9a50394df6d3cd177dc1f8ce1 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:57:24 +0200 Subject: [PATCH 046/175] Frontend - Fix web-assembly parameterised memory issue (#896) --- frontend/src/app/core/services/web-node.service.ts | 2 +- frontend/src/app/features/webnode/webnode.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index eedc2a5b27..d5227633f2 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -20,7 +20,7 @@ export class WebNodeService { readonly webnodeProgress$: BehaviorSubject = new BehaviorSubject(''); - memory: WebAssembly.Memory; + memory: WebAssembly.MemoryDescriptor; constructor(private http: HttpClient) { FileProgressHelper.initDownloadProgress(); diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index 39b05c6d00..33427c539d 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -45,7 +45,7 @@ export class WebnodeComponent extends StoreDispatcher implements OnInit { if (route.queryParams['shared']) { shared = route.queryParams['shared'] === 'true'; } - this.webNodeService.memory = new WebAssembly.Memory({ initial, maximum, shared }); + this.webNodeService.memory = { initial, maximum, shared }; }, filter(Boolean)); } From cd9122912fcc9f3939814592a12f8ba336a8ef99 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:08:05 +0200 Subject: [PATCH 047/175] Frontend - Fix web-assembly memory issue (#897) --- frontend/src/app/core/services/web-node.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index d5227633f2..7767b6b754 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -56,7 +56,7 @@ export class WebNodeService { startWasm$(): Observable { return of(any(window).webnode) .pipe( - switchMap((wasm: any) => from(wasm.default(undefined, this.memory)).pipe(map(() => wasm))), + switchMap((wasm: any) => from(wasm.default(undefined, new WebAssembly.Memory(this.memory))).pipe(map(() => wasm))), switchMap((wasm) => { this.webnodeProgress$.next('Loaded'); return from(wasm.run(this.webNodeKeyPair.privateKey)); From 728d42082b3dc0203ec899efd852f7dc40b28e0f Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 13 Nov 2024 09:50:12 -0300 Subject: [PATCH 048/175] fix(vrf-evaluator): Handle cases where the delegator table is empty --- .../block_producer_vrf_evaluator_reducer.rs | 6 ++++++ node/src/ledger/ledger_effects.rs | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs index 880db568c9..cb652384a7 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs @@ -304,6 +304,12 @@ impl BlockProducerVrfEvaluatorState { return; }; + openmina_core::log::warn!( + meta.time(); + kind = "BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction", + message = "Empty delegator table, account may not exist yet in the staking ledger" + ); + let mut staking_epoch_data = staking_epoch_data.clone(); staking_epoch_data.delegator_table = delegator_table.clone(); diff --git a/node/src/ledger/ledger_effects.rs b/node/src/ledger/ledger_effects.rs index d581d69c30..c4caf1ed47 100644 --- a/node/src/ledger/ledger_effects.rs +++ b/node/src/ledger/ledger_effects.rs @@ -417,7 +417,16 @@ fn propagate_read_response( return; } match table { - None => todo!("delegator table construction error handling"), + None => { + // TODO(tizoc): Revise this, may be better to dispatch a different action here + // and avoid running the VRF evaluator altogether when we know that the + // table is empty. + store.dispatch( + BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { + delegator_table: Default::default(), + }, + ); + } Some(table) => { store.dispatch( BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { From 90877b318211f7c36d2498aa32adc736c4ac7622 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:42:21 +0200 Subject: [PATCH 049/175] Frontend - Angular SSR (#899) --- frontend/angular.json | 89 +- frontend/httpd.conf | 20 +- frontend/package-lock.json | 968 +++++++++++++++--- frontend/package.json | 16 +- frontend/server.ts | 69 ++ frontend/src/app/app.component.ts | 14 +- frontend/src/app/app.module.server.ts | 14 + frontend/src/app/app.module.ts | 12 +- frontend/src/app/app.reducer.ts | 13 +- frontend/src/app/app.service.ts | 3 +- .../app/core/helpers/file-progress.helper.ts | 5 +- .../src/app/core/services/web-node.service.ts | 47 +- .../wallets/benchmarks-wallets-zk.service.ts | 6 +- .../wallets/benchmarks-wallets.reducer.ts | 10 +- .../wallets/benchmarks-wallets.service.ts | 10 +- .../block-production-overview.component.ts | 24 +- ...duction-overview-slot-details.component.ts | 3 +- ...ock-production-overview-slots.component.ts | 7 +- ...oduction-won-slots-side-panel.component.ts | 4 +- .../app/features/mempool/mempool.service.ts | 6 +- .../network-messages-side-panel.component.ts | 6 +- .../dashboard-splits-graph.component.ts | 5 +- .../memory-resources-table.component.ts | 4 +- .../memory-resources-treemap.component.ts | 15 +- .../memory/memory-resources.reducer.ts | 9 +- .../scan-state-side-panel.component.ts | 5 +- .../scan-state-tree-chart.component.ts | 18 +- .../snarks/scan-state/scan-state.reducer.ts | 8 +- .../snarks-work-pool-side-panel.component.ts | 5 +- .../web-node-initialization.component.ts | 656 ++++++------ .../web-node-not-supported.component.ts | 9 + .../app/features/webnode/webnode.component.ts | 1 + .../app/layout/toolbar/toolbar.component.ts | 2 +- frontend/src/app/shared/constants/config.ts | 24 +- .../src/app/shared/helpers/ledger.helper.ts | 8 +- frontend/src/environments/environment.prod.ts | 2 +- frontend/src/environments/environment.ts | 2 +- frontend/src/index.html | 56 +- frontend/src/main.server.ts | 1 + frontend/src/main.ts | 2 +- frontend/tsconfig.server.json | 14 + 41 files changed, 1574 insertions(+), 618 deletions(-) create mode 100644 frontend/server.ts create mode 100644 frontend/src/app/app.module.server.ts create mode 100644 frontend/src/main.server.ts create mode 100644 frontend/tsconfig.server.json diff --git a/frontend/angular.json b/frontend/angular.json index 2fc3226724..e7410b08a6 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -34,7 +34,7 @@ "customWebpackConfig": { "path": "./webpack.config.js" }, - "outputPath": "dist/frontend", + "outputPath": "dist/frontend/browser", "index": "src/index.html", "main": "src/main.ts", "polyfills": [ @@ -142,6 +142,93 @@ ], "scripts": [] } + }, + "server": { + "builder": "@angular-devkit/build-angular:server", + "options": { + "outputPath": "dist/frontend/server", + "main": "server.ts", + "tsConfig": "tsconfig.server.json", + "stylePreprocessorOptions": { + "includePaths": [ + "src/assets", + "src/assets/styles", + "src/assets/styles/utilities", + "src/assets/images" + ] + }, + "inlineStyleLanguage": "scss" + }, + "configurations": { + "production": { + "outputHashing": "media", + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ] + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "sourceMap": true, + "extractLicenses": false, + "vendorChunk": true + }, + "local": { + "outputHashing": "media", + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.local.ts" + } + ] + }, + "producer": { + "outputHashing": "media", + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.producer.ts" + } + ] + } + }, + "defaultConfiguration": "production" + }, + "serve-ssr": { + "builder": "@angular-devkit/build-angular:ssr-dev-server", + "configurations": { + "development": { + "browserTarget": "frontend:build:development", + "serverTarget": "frontend:server:development" + }, + "production": { + "browserTarget": "frontend:build:production", + "serverTarget": "frontend:server:production" + } + }, + "defaultConfiguration": "development" + }, + "prerender": { + "builder": "@angular-devkit/build-angular:prerender", + "options": { + "routes": [ + "/" + ] + }, + "configurations": { + "production": { + "browserTarget": "frontend:build:production", + "serverTarget": "frontend:server:production" + }, + "development": { + "browserTarget": "frontend:build:development", + "serverTarget": "frontend:server:development" + } + }, + "defaultConfiguration": "production" } } } diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 9f8d55a106..94d2dca798 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -234,17 +234,15 @@ SSLProxyEngine On # REMOVE CACHE ExpiresActive On - ExpiresByType text/html "access plus 0 seconds" - ExpiresByType text/htm "access plus 0 seconds" - ExpiresByType application/javascript "access plus 0 seconds" - ExpiresByType text/javascript "access plus 0 seconds" - ExpiresByType application/x-javascript "access plus 0 seconds" - ExpiresByType text/css "access plus 0 seconds" - ExpiresByType application/wasm "access plus 0 seconds" - ExpiresByType application/octet-stream "access plus 0 seconds" - ExpiresByType application/json "access plus 0 seconds" - ExpiresByType application/postcard "access plus 0 seconds" - ExpiresByType application/octet-stream "access plus 0 seconds" + + # Cache images for one week + ExpiresByType image/jpeg "access plus 1 week" + ExpiresByType image/jpg "access plus 1 week" + ExpiresByType image/svg "access plus 1 week" + ExpiresByType image/png "access plus 1 week" + ExpiresByType image/gif "access plus 1 week" + ExpiresByType image/webp "access plus 1 week" + ExpiresByType image/svg+xml "access plus 1 week" diff --git a/frontend/package-lock.json b/frontend/package-lock.json index a1ee521509..af771f478e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -17,13 +17,16 @@ "@angular/material": "^17.3.10", "@angular/platform-browser": "^17.3.12", "@angular/platform-browser-dynamic": "^17.3.12", + "@angular/platform-server": "^17.3.12", "@angular/router": "^17.3.12", + "@angular/ssr": "^17.3.10", "@ledgerhq/hw-transport-webhid": "^6.29.4", "@ngneat/until-destroy": "^10.0.0", "@ngrx/effects": "^17.2.0", "@ngrx/router-store": "^17.2.0", "@ngrx/store": "^17.2.0", - "@openmina/shared": "^0.102.0", + "@nguniversal/express-engine": "^7.0.2", + "@openmina/shared": "^0.107.0", "@sentry/angular": "^8.35.0", "@sentry/tracing": "^7.114.0", "base-x": "^5.0.0", @@ -31,6 +34,7 @@ "buffer": "^6.0.3", "d3": "^7.8.4", "eigen": "^0.2.2", + "express": "^4.18.2", "mathjs": "^12.3.0", "mina-signer": "^3.0.7", "ngx-json-viewer": "^3.2.1", @@ -46,9 +50,11 @@ "@angular/compiler-cli": "^17.3.12", "@ngrx/store-devtools": "^17.2.0", "@types/d3": "^7.4.0", + "@types/express": "^4.17.17", "@types/jasmine": "~4.3.0", - "@types/node": "^20.4.8", + "@types/node": "^18.19.64", "@types/w3c-web-hid": "^1.0.6", + "browser-sync": "^3.0.0", "cypress": "^13.3.2", "cypress-real-events": "^1.10.0", "jasmine-core": "~4.6.0", @@ -1018,6 +1024,26 @@ "@angular/platform-browser": "17.3.12" } }, + "node_modules/@angular/platform-server": { + "version": "17.3.12", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz", + "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0", + "xhr2": "^0.2.0" + }, + "engines": { + "node": "^18.13.0 || >=20.9.0" + }, + "peerDependencies": { + "@angular/animations": "17.3.12", + "@angular/common": "17.3.12", + "@angular/compiler": "17.3.12", + "@angular/core": "17.3.12", + "@angular/platform-browser": "17.3.12" + } + }, "node_modules/@angular/router": { "version": "17.3.12", "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.12.tgz", @@ -1035,6 +1061,20 @@ "rxjs": "^6.5.3 || ^7.4.0" } }, + "node_modules/@angular/ssr": { + "version": "17.3.11", + "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.11.tgz", + "integrity": "sha512-8AslXZnj5bu0fJrSSoZf202HXptc+vS8hSvEIobK1+UpEVmtrk3StiBxYTdbN4Pe76r7RGRmBt40fHe+88AZoA==", + "license": "MIT", + "dependencies": { + "critters": "0.0.22", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": "^17.0.0", + "@angular/core": "^17.0.0" + } + }, "node_modules/@babel/code-frame": { "version": "7.25.9", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.9.tgz", @@ -4410,6 +4450,18 @@ "webpack": "^5.54.0" } }, + "node_modules/@nguniversal/express-engine": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@nguniversal/express-engine/-/express-engine-7.0.2.tgz", + "integrity": "sha512-mmNgDpUrcuFcjBOfUlmAliS3St4tSekLdQZWu6PK/d+kw5zicDDlSO/UoUw5g+wz7YHkGQK+VDy3wHc0Bo36rA==", + "license": "MIT", + "peerDependencies": { + "@angular/common": ">=6.0.0", + "@angular/core": ">=6.0.0", + "@angular/platform-server": ">=6.0.0", + "express": "^4.15.2" + } + }, "node_modules/@noble/hashes": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz", @@ -4746,9 +4798,10 @@ } }, "node_modules/@openmina/shared": { - "version": "0.102.0", - "resolved": "https://registry.npmjs.org/@openmina/shared/-/shared-0.102.0.tgz", - "integrity": "sha512-Tk2kf0b+NQqLQTSqpF+qCeanfGtAfr34RHJcnE/T9iRhzej02Ss5IH2cgzvy5kgSW1IjxT6qsCpUONaRMMmZAw==", + "version": "0.107.0", + "resolved": "https://registry.npmjs.org/@openmina/shared/-/shared-0.107.0.tgz", + "integrity": "sha512-ozO4CpSm07b1ieQ6ejBO+lYC3ZYljEfDAbkDwNIJAd6ml7gOK9swSoAtRJTkYYCRuMinHwL4JgBTVHidaxZnOQ==", + "license": "Apache License, Version 2.0", "dependencies": { "tslib": ">=2.3.0" }, @@ -5706,7 +5759,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.10.3", + "version": "18.19.64", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.64.tgz", + "integrity": "sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5999,7 +6054,6 @@ }, "node_modules/accepts": { "version": "1.3.8", - "dev": true, "license": "MIT", "dependencies": { "mime-types": "~2.1.34", @@ -6234,8 +6288,7 @@ "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/asn1": { "version": "0.2.6", @@ -6266,6 +6319,16 @@ "dev": true, "license": "MIT" }, + "node_modules/async-each-series": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz", + "integrity": "sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/asynckit": { "version": "0.4.0", "dev": true, @@ -6559,7 +6622,6 @@ "version": "1.20.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", - "dev": true, "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -6581,7 +6643,6 @@ }, "node_modules/body-parser/node_modules/debug": { "version": "2.6.9", - "dev": true, "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -6589,7 +6650,6 @@ }, "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", - "dev": true, "license": "MIT" }, "node_modules/bonjour-service": { @@ -6605,8 +6665,7 @@ "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "node_modules/brace-expansion": { "version": "1.1.11", @@ -6618,16 +6677,408 @@ } }, "node_modules/braces": { - "version": "3.0.2", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-sync": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.3.tgz", + "integrity": "sha512-91hoBHKk1C4pGeD+oE9Ld222k2GNQEAsI5AElqR8iLLWNrmZR2LPP8B0h8dpld9u7kro5IEUB3pUb0DJ3n1cRQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "browser-sync-client": "^3.0.3", + "browser-sync-ui": "^3.0.3", + "bs-recipes": "1.3.4", + "chalk": "4.1.2", + "chokidar": "^3.5.1", + "connect": "3.6.6", + "connect-history-api-fallback": "^1", + "dev-ip": "^1.0.1", + "easy-extender": "^2.3.4", + "eazy-logger": "^4.0.1", + "etag": "^1.8.1", + "fresh": "^0.5.2", + "fs-extra": "3.0.1", + "http-proxy": "^1.18.1", + "immutable": "^3", + "micromatch": "^4.0.8", + "opn": "5.3.0", + "portscanner": "2.2.0", + "raw-body": "^2.3.2", + "resp-modifier": "6.0.2", + "rx": "4.1.0", + "send": "^0.19.0", + "serve-index": "^1.9.1", + "serve-static": "^1.16.2", + "server-destroy": "1.0.1", + "socket.io": "^4.4.1", + "ua-parser-js": "^1.0.33", + "yargs": "^17.3.1" + }, + "bin": { + "browser-sync": "dist/bin.js" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/browser-sync-client": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.3.tgz", + "integrity": "sha512-TOEXaMgYNjBYIcmX5zDlOdjEqCeCN/d7opf/fuyUD/hhGVCfP54iQIDhENCi012AqzYZm3BvuFl57vbwSTwkSQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "etag": "1.8.1", + "fresh": "0.5.2", + "mitt": "^1.1.3" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/browser-sync-ui": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.3.tgz", + "integrity": "sha512-FcGWo5lP5VodPY6O/f4pXQy5FFh4JK0f2/fTBsp0Lx1NtyBWs/IfPPJbW8m1ujTW/2r07oUXKTF2LYZlCZktjw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "async-each-series": "0.1.1", + "chalk": "4.1.2", + "connect-history-api-fallback": "^1", + "immutable": "^3", + "server-destroy": "1.0.1", + "socket.io-client": "^4.4.1", + "stream-throttle": "^0.1.3" + } + }, + "node_modules/browser-sync-ui/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/browser-sync-ui/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/browser-sync-ui/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/browser-sync-ui/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/browser-sync-ui/node_modules/connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/browser-sync-ui/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-sync-ui/node_modules/immutable": { + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", + "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/browser-sync-ui/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "has-flag": "^4.0.0" }, "engines": { "node": ">=8" } }, + "node_modules/browser-sync/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/browser-sync/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/browser-sync/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/browser-sync/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/browser-sync/node_modules/connect": { + "version": "3.6.6", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz", + "integrity": "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "finalhandler": "1.1.0", + "parseurl": "~1.3.2", + "utils-merge": "1.0.1" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/browser-sync/node_modules/connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/browser-sync/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/browser-sync/node_modules/finalhandler": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", + "integrity": "sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.1", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.3.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/browser-sync/node_modules/fs-extra": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^3.0.0", + "universalify": "^0.1.0" + } + }, + "node_modules/browser-sync/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-sync/node_modules/immutable": { + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", + "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/browser-sync/node_modules/jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==", + "dev": true, + "license": "MIT", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/browser-sync/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, + "node_modules/browser-sync/node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "dev": true, + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/browser-sync/node_modules/statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/browser-sync/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-sync/node_modules/ua-parser-js": { + "version": "1.0.39", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.39.tgz", + "integrity": "sha512-k24RCVWlEcjkdOxYmVJgeD/0a1TiSpqLg+ZalVGV9lsnr4yqu0w7tX/x2xX6G4zpkgQnRf89lxuZ1wsbjXM8lw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/ua-parser-js" + }, + { + "type": "paypal", + "url": "https://paypal.me/faisalman" + }, + { + "type": "github", + "url": "https://github.com/sponsors/faisalman" + } + ], + "license": "MIT", + "bin": { + "ua-parser-js": "script/cli.js" + }, + "engines": { + "node": "*" + } + }, "node_modules/browserslist": { "version": "4.24.2", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", @@ -6660,6 +7111,13 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/bs-recipes": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz", + "integrity": "sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==", + "dev": true, + "license": "ISC" + }, "node_modules/bs58": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/bs58/-/bs58-6.0.0.tgz", @@ -6715,7 +7173,6 @@ }, "node_modules/bytes": { "version": "3.1.2", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -6806,7 +7263,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -7215,7 +7671,6 @@ "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, "dependencies": { "safe-buffer": "5.2.1" }, @@ -7225,7 +7680,6 @@ }, "node_modules/content-type": { "version": "1.0.5", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -7247,8 +7701,7 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, "node_modules/copy-anything": { "version": "2.0.6", @@ -7380,7 +7833,6 @@ "version": "0.0.22", "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz", "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==", - "dev": true, "dependencies": { "chalk": "^4.1.0", "css-select": "^5.1.0", @@ -7395,7 +7847,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -7410,7 +7861,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -7426,7 +7876,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -7437,14 +7886,12 @@ "node_modules/critters/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/critters/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -7453,7 +7900,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -7555,7 +8001,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", - "dev": true, "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.1.0", @@ -7571,7 +8016,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true, "engines": { "node": ">= 6" }, @@ -7661,14 +8105,6 @@ "cypress": "^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x || ^13.x" } }, - "node_modules/cypress/node_modules/@types/node": { - "version": "18.19.2", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~5.26.4" - } - }, "node_modules/cypress/node_modules/ansi-styles": { "version": "4.3.0", "dev": true, @@ -8299,7 +8735,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -8337,7 +8772,6 @@ }, "node_modules/depd": { "version": "2.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -8345,7 +8779,6 @@ }, "node_modules/destroy": { "version": "1.2.0", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8", @@ -8358,6 +8791,18 @@ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true }, + "node_modules/dev-ip": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz", + "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==", + "dev": true, + "bin": { + "dev-ip": "lib/dev-ip.js" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/di": { "version": "0.0.1", "dev": true, @@ -8410,7 +8855,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", - "dev": true, "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -8424,7 +8868,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, "funding": [ { "type": "github", @@ -8436,7 +8879,6 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", - "dev": true, "dependencies": { "domelementtype": "^2.3.0" }, @@ -8444,33 +8886,132 @@ "node": ">= 4" }, "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, + "node_modules/easy-extender": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz", + "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==", + "dev": true, + "dependencies": { + "lodash": "^4.17.10" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/eazy-logger": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz", + "integrity": "sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==", + "dev": true, + "dependencies": { + "chalk": "4.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/eazy-logger/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eazy-logger/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "node_modules/eazy-logger/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { - "dom-serializer": "^2.0.0", - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3" + "color-name": "~1.1.4" }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" + "engines": { + "node": ">=7.0.0" } }, - "node_modules/duplexer": { - "version": "0.1.2", + "node_modules/eazy-logger/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true, "license": "MIT" }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "node_modules/eazy-logger/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/eazy-logger/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } }, "node_modules/ecc-jsbn": { "version": "0.1.2", @@ -8483,7 +9024,6 @@ }, "node_modules/ee-first": { "version": "1.1.1", - "dev": true, "license": "MIT" }, "node_modules/eigen": { @@ -8515,7 +9055,6 @@ }, "node_modules/encodeurl": { "version": "1.0.2", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -8572,6 +9111,42 @@ "node": ">=10.2.0" } }, + "node_modules/engine.io-client": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.2.tgz", + "integrity": "sha512-TAr+NKeoVTjEVW8P3iHguO1LO6RlUz9O5Y8o7EY0fU+gY1NYqas7NN3slpFtbXEsLMHk0h90fJMfKjRkQ0qUIw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1", + "engine.io-parser": "~5.2.1", + "ws": "~8.17.1", + "xmlhttprequest-ssl": "~2.1.1" + } + }, + "node_modules/engine.io-client/node_modules/ws": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/engine.io-parser": { "version": "5.2.1", "dev": true, @@ -8632,7 +9207,6 @@ }, "node_modules/entities": { "version": "4.5.0", - "devOptional": true, "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -8681,7 +9255,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dev": true, "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -8693,7 +9266,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -8765,7 +9337,6 @@ }, "node_modules/escape-html": { "version": "1.0.3", - "dev": true, "license": "MIT" }, "node_modules/escape-latex": { @@ -8844,7 +9415,6 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -8918,7 +9488,6 @@ "version": "4.21.1", "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", - "dev": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -8960,7 +9529,6 @@ "version": "0.7.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -8969,7 +9537,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -8978,7 +9545,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -8987,7 +9553,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", - "dev": true, "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", @@ -9004,14 +9569,12 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/express/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -9144,7 +9707,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "license": "MIT", "dependencies": { @@ -9295,7 +9860,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -9317,7 +9881,6 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -9372,7 +9935,6 @@ }, "node_modules/function-bind": { "version": "1.1.2", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9398,7 +9960,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -9536,7 +10097,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -9582,7 +10142,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0" }, @@ -9592,7 +10151,6 @@ }, "node_modules/has-proto": { "version": "1.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -9603,7 +10161,6 @@ }, "node_modules/has-symbols": { "version": "1.0.3", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -9623,7 +10180,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -9716,7 +10272,6 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", - "dev": true, "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -9745,7 +10300,6 @@ }, "node_modules/http-errors": { "version": "2.0.0", - "dev": true, "license": "MIT", "dependencies": { "depd": "2.0.0", @@ -9760,7 +10314,6 @@ }, "node_modules/http-errors/node_modules/statuses": { "version": "2.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -9859,7 +10412,6 @@ }, "node_modules/iconv-lite": { "version": "0.4.24", - "dev": true, "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" @@ -10013,7 +10565,6 @@ }, "node_modules/inherits": { "version": "2.0.4", - "dev": true, "license": "ISC" }, "node_modules/ini": { @@ -10266,12 +10817,24 @@ }, "node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" } }, + "node_modules/is-number-like": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz", + "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", + "dev": true, + "license": "ISC", + "dependencies": { + "lodash.isfinite": "^3.3.2" + } + }, "node_modules/is-path-inside": { "version": "3.0.3", "dev": true, @@ -10935,6 +11498,12 @@ } } }, + "node_modules/limiter": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", + "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==", + "dev": true + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -11005,6 +11574,13 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, + "node_modules/lodash.isfinite": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", + "integrity": "sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==", + "dev": true, + "license": "MIT" + }, "node_modules/lodash.once": { "version": "4.1.1", "dev": true, @@ -11286,7 +11862,6 @@ }, "node_modules/media-typer": { "version": "0.3.0", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -11308,7 +11883,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "dev": true, "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -11330,17 +11904,18 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/micromatch": { - "version": "4.0.5", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -11360,7 +11935,6 @@ }, "node_modules/mime-db": { "version": "1.52.0", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -11368,7 +11942,6 @@ }, "node_modules/mime-types": { "version": "2.1.35", - "dev": true, "license": "MIT", "dependencies": { "mime-db": "1.52.0" @@ -11626,6 +12199,13 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "node_modules/mitt": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz", + "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==", + "dev": true, + "license": "MIT" + }, "node_modules/mkdirp": { "version": "0.5.6", "dev": true, @@ -11674,7 +12254,6 @@ }, "node_modules/nanoid": { "version": "3.3.7", - "dev": true, "funding": [ { "type": "github", @@ -11729,7 +12308,6 @@ }, "node_modules/negotiator": { "version": "0.6.3", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -12061,7 +12639,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, "dependencies": { "boolbase": "^1.0.0" }, @@ -12079,7 +12656,6 @@ }, "node_modules/object-inspect": { "version": "1.13.1", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12093,7 +12669,6 @@ }, "node_modules/on-finished": { "version": "2.4.1", - "dev": true, "license": "MIT", "dependencies": { "ee-first": "1.1.1" @@ -12157,6 +12732,29 @@ "opener": "bin/opener-bin.js" } }, + "node_modules/opn": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", + "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-wsl": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/opn/node_modules/is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/ora": { "version": "5.4.1", "dev": true, @@ -12450,7 +13048,6 @@ }, "node_modules/parseurl": { "version": "1.3.3", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -12511,8 +13108,7 @@ "node_modules/path-to-regexp": { "version": "0.1.10", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", - "dev": true + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/path-type": { "version": "4.0.0", @@ -12535,8 +13131,7 @@ "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -12646,9 +13241,33 @@ "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, + "node_modules/portscanner": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz", + "integrity": "sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==", + "dev": true, + "license": "MIT", + "dependencies": { + "async": "^2.6.0", + "is-number-like": "^1.0.3" + }, + "engines": { + "node": ">=0.4", + "npm": ">=1.0.0" + } + }, + "node_modules/portscanner/node_modules/async": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } + }, "node_modules/postcss": { "version": "8.4.31", - "dev": true, "funding": [ { "type": "opencollective", @@ -12707,8 +13326,7 @@ "node_modules/postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", - "dev": true + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==" }, "node_modules/postcss-modules-extract-imports": { "version": "3.1.0", @@ -12845,7 +13463,6 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -12858,7 +13475,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true, "engines": { "node": ">= 0.10" } @@ -12908,7 +13524,6 @@ "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "dev": true, "dependencies": { "side-channel": "^1.0.6" }, @@ -12953,7 +13568,6 @@ }, "node_modules/range-parser": { "version": "1.2.1", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -12961,7 +13575,6 @@ }, "node_modules/raw-body": { "version": "2.5.2", - "dev": true, "license": "MIT", "dependencies": { "bytes": "3.1.2", @@ -13268,6 +13881,36 @@ "node": ">=0.10.0" } }, + "node_modules/resp-modifier": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz", + "integrity": "sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==", + "dev": true, + "dependencies": { + "debug": "^2.2.0", + "minimatch": "^3.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/resp-modifier/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/resp-modifier/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, "node_modules/restore-cursor": { "version": "3.1.0", "dev": true, @@ -13391,6 +14034,13 @@ "version": "1.3.3", "license": "BSD-3-Clause" }, + "node_modules/rx": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", + "integrity": "sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/rxjs": { "version": "7.8.1", "license": "Apache-2.0", @@ -13400,7 +14050,6 @@ }, "node_modules/safe-buffer": { "version": "5.2.1", - "dev": true, "funding": [ { "type": "github", @@ -13561,7 +14210,6 @@ "version": "0.19.0", "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "dev": true, "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -13585,7 +14233,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -13593,14 +14240,12 @@ "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/send/node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true, "bin": { "mime": "cli.js" }, @@ -13611,14 +14256,12 @@ "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/send/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -13704,7 +14347,6 @@ "version": "1.16.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", - "dev": true, "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", @@ -13719,16 +14361,21 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true, "engines": { "node": ">= 0.8" } }, + "node_modules/server-destroy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz", + "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==", + "dev": true, + "license": "ISC" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -13743,7 +14390,6 @@ }, "node_modules/setprototypeof": { "version": "1.2.0", - "dev": true, "license": "ISC" }, "node_modules/shallow-clone": { @@ -13789,7 +14435,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", - "dev": true, "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -13947,6 +14592,22 @@ } } }, + "node_modules/socket.io-client": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz", + "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.2", + "engine.io-client": "~6.6.1", + "socket.io-parser": "~4.2.4" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/socket.io-parser": { "version": "4.2.4", "dev": true, @@ -14010,7 +14671,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -14175,6 +14835,23 @@ "node": ">= 0.6" } }, + "node_modules/stream-throttle": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", + "integrity": "sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "commander": "^2.2.0", + "limiter": "^1.0.5" + }, + "bin": { + "throttleproxy": "bin/throttleproxy.js" + }, + "engines": { + "node": ">= 0.10.0" + } + }, "node_modules/streamroller": { "version": "3.1.5", "dev": true, @@ -14538,6 +15215,8 @@ }, "node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "license": "MIT", "dependencies": { @@ -14549,7 +15228,6 @@ }, "node_modules/toidentifier": { "version": "1.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">=0.6" @@ -14698,7 +15376,6 @@ }, "node_modules/type-is": { "version": "1.6.18", - "dev": true, "license": "MIT", "dependencies": { "media-typer": "0.3.0", @@ -14843,7 +15520,6 @@ }, "node_modules/unpipe": { "version": "1.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -14911,7 +15587,6 @@ }, "node_modules/utils-merge": { "version": "1.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4.0" @@ -14952,7 +15627,6 @@ }, "node_modules/vary": { "version": "1.1.2", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.8" @@ -15993,6 +16667,24 @@ } } }, + "node_modules/xhr2": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz", + "integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/xmlhttprequest-ssl": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz", + "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/y18n": { "version": "5.0.8", "dev": true, diff --git a/frontend/package.json b/frontend/package.json index 11a9fc103a..d329046069 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,11 @@ "tests:headless": "npx cypress run --headless --config baseUrl=http://localhost:4200", "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t openmina/frontend:latest . && docker push openmina/frontend:latest", "start:bundle": "npx http-server dist/frontend -p 4200", - "prebuild": "node scripts/update-webnode-version.js" + "prebuild": "node scripts/update-webnode-version.js", + "dev:ssr": "ng run frontend:serve-ssr", + "serve:ssr": "node dist/frontend/server/main.js", + "build:ssr": "ng build && ng run frontend:server", + "prerender": "ng run frontend:prerender" }, "private": true, "dependencies": { @@ -25,13 +29,16 @@ "@angular/material": "^17.3.10", "@angular/platform-browser": "^17.3.12", "@angular/platform-browser-dynamic": "^17.3.12", + "@angular/platform-server": "^17.3.12", "@angular/router": "^17.3.12", + "@angular/ssr": "^17.3.10", "@ledgerhq/hw-transport-webhid": "^6.29.4", "@ngneat/until-destroy": "^10.0.0", "@ngrx/effects": "^17.2.0", "@ngrx/router-store": "^17.2.0", "@ngrx/store": "^17.2.0", - "@openmina/shared": "^0.102.0", + "@nguniversal/express-engine": "^7.0.2", + "@openmina/shared": "^0.107.0", "@sentry/angular": "^8.35.0", "@sentry/tracing": "^7.114.0", "base-x": "^5.0.0", @@ -39,6 +46,7 @@ "buffer": "^6.0.3", "d3": "^7.8.4", "eigen": "^0.2.2", + "express": "^4.18.2", "mathjs": "^12.3.0", "mina-signer": "^3.0.7", "ngx-json-viewer": "^3.2.1", @@ -54,9 +62,11 @@ "@angular/compiler-cli": "^17.3.12", "@ngrx/store-devtools": "^17.2.0", "@types/d3": "^7.4.0", + "@types/express": "^4.17.17", "@types/jasmine": "~4.3.0", - "@types/node": "^20.4.8", + "@types/node": "^18.19.64", "@types/w3c-web-hid": "^1.0.6", + "browser-sync": "^3.0.0", "cypress": "^13.3.2", "cypress-real-events": "^1.10.0", "jasmine-core": "~4.6.0", diff --git a/frontend/server.ts b/frontend/server.ts new file mode 100644 index 0000000000..a127b5bb47 --- /dev/null +++ b/frontend/server.ts @@ -0,0 +1,69 @@ +import 'zone.js/node'; + +import { APP_BASE_HREF } from '@angular/common'; +import { CommonEngine } from '@angular/ssr'; +import * as express from 'express'; +import { existsSync } from 'node:fs'; +import { join } from 'node:path'; +import AppServerModule from './src/main.server'; + +// The Express app is exported so that it can be used by serverless Functions. +export function app(): express.Express { + const server = express(); + const distFolder = join(process.cwd(), 'dist/frontend/browser'); + const indexHtml = existsSync(join(distFolder, 'index.original.html')) + ? join(distFolder, 'index.original.html') + : join(distFolder, 'index.html'); + + const commonEngine = new CommonEngine(); + + server.set('view engine', 'html'); + server.set('views', distFolder); + + // Example Express Rest API endpoints + // server.get('/api/**', (req, res) => { }); + // Serve static files from /browser + server.get('*.*', express.static(distFolder, { + maxAge: '1y' + })); + + // All regular routes use the Angular engine + server.get('*', (req, res, next) => { + const { protocol, originalUrl, baseUrl, headers } = req; + + commonEngine + .render({ + bootstrap: AppServerModule, + documentFilePath: indexHtml, + url: `${protocol}://${headers.host}${originalUrl}`, + publicPath: distFolder, + providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }], + }) + .then((html) => res.send(html)) + .catch((err) => next(err)); + }); + + return server; +} + +function run(): void { + const port = process.env['PORT'] || 4000; + + // Start up the Node server + const server = app(); + server.listen(port, () => { + console.log(`Node Express server listening on http://localhost:${port}`); + }); +} + +// Webpack will replace 'require' with '__webpack_require__' +// '__non_webpack_require__' is a proxy to Node 'require' +// The below code is to ensure that the server is run only when not requiring the bundle. +declare const __non_webpack_require__: NodeRequire; +const mainModule = __non_webpack_require__.main; +const moduleFilename = mainModule && mainModule.filename || ''; +if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { + run(); +} + +export default AppServerModule; diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 1d90a99569..6eaed1eeb9 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { any, getMergedRoute, MAX_WIDTH_700, MergedRoute } from '@openmina/shared'; +import { any, getMergedRoute, getWindow, MAX_WIDTH_700, MergedRoute, safelyExecuteInBrowser } from '@openmina/shared'; import { AppMenu } from '@shared/types/app/app-menu.type'; import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout'; import { AppSelectors } from '@app/app.state'; @@ -33,10 +33,12 @@ export class AppComponent extends StoreDispatcher implements OnInit { private router: Router, private webNodeService: WebNodeService) { super(); - if (any(window).Cypress) { - any(window).config = CONFIG; - any(window).store = this.store; - } + safelyExecuteInBrowser(() => { + if (any(window).Cypress) { + any(window).config = CONFIG; + any(window).store = this.store; + } + }) } ngOnInit(): void { @@ -65,7 +67,7 @@ export class AppComponent extends StoreDispatcher implements OnInit { private initAppFunctionalities(): void { if (this.webNodeService.hasWebNodeConfig() && !this.webNodeService.isWebNodeLoaded()) { - if (!window.location.href.includes(`/${Routes.LOADING_WEB_NODE}`)) { + if (!getWindow()?.location.href.includes(`/${Routes.LOADING_WEB_NODE}`)) { this.router.navigate([Routes.LOADING_WEB_NODE], { queryParamsHandling: 'preserve' }); } } diff --git a/frontend/src/app/app.module.server.ts b/frontend/src/app/app.module.server.ts new file mode 100644 index 0000000000..795380cd22 --- /dev/null +++ b/frontend/src/app/app.module.server.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { ServerModule } from '@angular/platform-server'; + +import { AppModule } from './app.module'; +import { AppComponent } from './app.component'; + +@NgModule({ + imports: [ + AppModule, + ServerModule, + ], + bootstrap: [AppComponent], +}) +export class AppServerModule {} diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 322a443d48..775c514c6d 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -1,5 +1,5 @@ import { APP_INITIALIZER, ErrorHandler, Injectable, LOCALE_ID, NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; +import { BrowserModule, provideClientHydration } from '@angular/platform-browser'; import { AppComponent } from './app.component'; import { AppRouting } from './app.routing'; @@ -9,7 +9,7 @@ import { GlobalErrorHandlerService, HorizontalMenuComponent, NgrxRouterStoreModule, - OpenminaEagerSharedModule, + OpenminaEagerSharedModule, safelyExecuteInBrowser, THEME_PROVIDER, } from '@openmina/shared'; import { CommonModule, registerLocaleData } from '@angular/common'; @@ -29,7 +29,7 @@ import { metaReducers, reducers } from '@app/app.setup'; import { EffectsModule } from '@ngrx/effects'; import { AppEffects } from '@app/app.effects'; import { StoreDevtoolsModule } from '@ngrx/store-devtools'; -import { HttpClientModule } from '@angular/common/http'; +import { HttpClientModule, provideHttpClient, withFetch } from '@angular/common/http'; import { NewNodeComponent } from './layout/new-node/new-node.component'; import { ReactiveFormsModule } from '@angular/forms'; import { WebNodeLandingPageComponent } from '@app/layout/web-node-landing-page/web-node-landing-page.component'; @@ -42,7 +42,9 @@ registerLocaleData(localeEn, 'en'); @Injectable() export class AppGlobalErrorhandler implements ErrorHandler { constructor(private errorHandlerService: GlobalErrorHandlerService) { - this.setupErrorHandlers(); + safelyExecuteInBrowser(() => { + this.setupErrorHandlers(); + }); if (WebAssembly) { this.interceptWebAssembly(); @@ -166,6 +168,8 @@ export class AppGlobalErrorhandler implements ErrorHandler { deps: [Sentry.TraceService], multi: true, }, + provideClientHydration(), + provideHttpClient(withFetch()), ], bootstrap: [AppComponent], }) diff --git a/frontend/src/app/app.reducer.ts b/frontend/src/app/app.reducer.ts index 0688276357..8621f3b53a 100644 --- a/frontend/src/app/app.reducer.ts +++ b/frontend/src/app/app.reducer.ts @@ -3,10 +3,11 @@ import { AppState } from '@app/app.state'; import { MinaNode } from '@shared/types/core/environment/mina-env.type'; import { createReducer, on } from '@ngrx/store'; import { AppNodeStatus } from '@shared/types/app/app-node-details.type'; +import { getLocalStorage } from '@openmina/shared'; const initialState: AppState = { menu: { - collapsed: JSON.parse(localStorage.getItem('menu_collapsed')) || false, + collapsed: JSON.parse(getLocalStorage()?.getItem('menu_collapsed') ?? 'false') || false, isMobile: false, open: true, }, @@ -30,7 +31,7 @@ export const appReducer = createReducer( on(AppActions.changeActiveNode, (state, { node }) => ({ ...state, activeNode: node })), on(AppActions.getNodeDetailsSuccess, (state, { details }) => ({ ...state, activeNodeDetails: details })), on(AppActions.changeMenuCollapsing, (state, { isCollapsing }) => { - localStorage.setItem('menu_collapsed', JSON.stringify(isCollapsing)); + getLocalStorage()?.setItem('menu_collapsed', JSON.stringify(isCollapsing)); return { ...state, menu: { ...state.menu, collapsed: isCollapsing } }; }), on(AppActions.toggleMobile, (state, { isMobile }) => ({ @@ -39,13 +40,13 @@ export const appReducer = createReducer( })), on(AppActions.toggleMenuOpening, (state) => ({ ...state, menu: { ...state.menu, open: !state.menu.open } })), on(AppActions.addNode, (state, { node }) => { - const customNodes = JSON.parse(localStorage.getItem('custom_nodes') ?? '[]'); - localStorage.setItem('custom_nodes', JSON.stringify([node, ...customNodes])); + const customNodes = JSON.parse(getLocalStorage()?.getItem('custom_nodes') ?? '[]'); + getLocalStorage()?.setItem('custom_nodes', JSON.stringify([node, ...customNodes])); return { ...state, nodes: [node, ...state.nodes] }; }), on(AppActions.deleteNode, (state, { node }) => { - const customNodes = JSON.parse(localStorage.getItem('custom_nodes') ?? '[]'); - localStorage.setItem('custom_nodes', JSON.stringify(customNodes.filter((n: MinaNode) => n.name !== node.name))); + const customNodes = JSON.parse(getLocalStorage()?.getItem('custom_nodes') ?? '[]'); + getLocalStorage()?.setItem('custom_nodes', JSON.stringify(customNodes.filter((n: MinaNode) => n.name !== node.name))); const nodes = state.nodes.filter(n => n.name !== node.name); return { ...state, nodes, activeNode: state.activeNode?.name === node.name ? nodes[0] : state.activeNode }; }), diff --git a/frontend/src/app/app.service.ts b/frontend/src/app/app.service.ts index 7090d81d17..829e0753e9 100644 --- a/frontend/src/app/app.service.ts +++ b/frontend/src/app/app.service.ts @@ -5,6 +5,7 @@ import { CONFIG } from '@shared/constants/config'; import { RustService } from '@core/services/rust.service'; import { AppNodeDetails, AppNodeStatus } from '@shared/types/app/app-node-details.type'; import { getNetwork } from '@shared/helpers/mina.helper'; +import { getLocalStorage } from '@openmina/shared'; @Injectable({ providedIn: 'root', @@ -23,7 +24,7 @@ export class AppService { getNodes(): Observable { return of([ ...CONFIG.configs, - ...JSON.parse(localStorage.getItem('custom_nodes') ?? '[]'), + ...JSON.parse(getLocalStorage()?.getItem('custom_nodes') ?? '[]'), ]); } diff --git a/frontend/src/app/core/helpers/file-progress.helper.ts b/frontend/src/app/core/helpers/file-progress.helper.ts index 2e53a10f03..4b608ee40b 100644 --- a/frontend/src/app/core/helpers/file-progress.helper.ts +++ b/frontend/src/app/core/helpers/file-progress.helper.ts @@ -1,4 +1,5 @@ import { BehaviorSubject } from 'rxjs'; +import { safelyExecuteInBrowser } from '@openmina/shared'; class AssetMonitor { readonly downloads: Map = new Map(); @@ -6,7 +7,9 @@ class AssetMonitor { constructor(progress$: BehaviorSubject) { this.progress$ = progress$; - this.setupInterceptor(); + safelyExecuteInBrowser(() => { + this.setupInterceptor(); + }); } private setupInterceptor(): void { diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index 7767b6b754..9dc17a8cb8 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject, catchError, filter, from, fromEvent, map, merge, Observable, of, switchMap, tap, throwError } from 'rxjs'; +import { BehaviorSubject, catchError, EMPTY, filter, from, fromEvent, map, merge, Observable, of, switchMap, tap, throwError } from 'rxjs'; import base from 'base-x'; -import { any } from '@openmina/shared'; +import { any, isBrowser, safelyExecuteInBrowser } from '@openmina/shared'; import { HttpClient } from '@angular/common/http'; import { sendSentryEvent } from '@shared/helpers/webnode.helper'; import { DashboardPeerStatus } from '@shared/types/dashboard/dashboard.peer'; @@ -25,10 +25,12 @@ export class WebNodeService { constructor(private http: HttpClient) { FileProgressHelper.initDownloadProgress(); const basex = base('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'); - any(window)['bs58btc'] = { - encode: (buffer: Uint8Array | number[]) => 'z' + basex.encode(buffer), - decode: (string: string) => basex.decode(string.substring(1)), - }; + safelyExecuteInBrowser(() => { + any(window)['bs58btc'] = { + encode: (buffer: Uint8Array | number[]) => 'z' + basex.encode(buffer), + decode: (string: string) => basex.decode(string.substring(1)), + }; + }); } hasWebNodeConfig(): boolean { @@ -36,25 +38,32 @@ export class WebNodeService { } isWebNodeLoaded(): boolean { - return !!any(window).webnode; + if (isBrowser()) { + return !!any(window).webnode; + } + return false; } loadWasm$(): Observable { this.webNodeStartTime = Date.now(); - return merge( - of(any(window).webnode).pipe(filter(Boolean)), - fromEvent(window, 'webNodeLoaded'), - ).pipe( - switchMap(() => this.http.get<{ publicKey: string, privateKey: string }>('assets/webnode/web-node-secrets.json')), - tap(data => { - this.webNodeKeyPair = data; - }), - map(() => void 0), - ); + if (isBrowser()) { + return merge( + of(any(window).webnode).pipe(filter(Boolean)), + fromEvent(window, 'webNodeLoaded'), + ).pipe( + switchMap(() => this.http.get<{ publicKey: string, privateKey: string }>('assets/webnode/web-node-secrets.json')), + tap(data => { + this.webNodeKeyPair = data; + }), + map(() => void 0), + ); + } + return EMPTY; } startWasm$(): Observable { - return of(any(window).webnode) + if (isBrowser()) { + return of(any(window).webnode) .pipe( switchMap((wasm: any) => from(wasm.default(undefined, new WebAssembly.Memory(this.memory))).pipe(map(() => wasm))), switchMap((wasm) => { @@ -73,6 +82,8 @@ export class WebNodeService { switchMap(() => this.webnode$.asObservable()), filter(Boolean), ); + } + return EMPTY; } get status$(): Observable { diff --git a/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets-zk.service.ts b/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets-zk.service.ts index 2c425391df..f1896a2c64 100644 --- a/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets-zk.service.ts +++ b/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets-zk.service.ts @@ -3,7 +3,7 @@ import { BehaviorSubject, catchError, filter, map, Observable, of, switchMap } f import { BenchmarksZkapp } from '@shared/types/benchmarks/transactions/benchmarks-zkapp.type'; import { fromPromise } from 'rxjs/internal/observable/innerFrom'; import { CONFIG } from '@shared/constants/config'; -import { any } from '@openmina/shared'; +import { any, safelyExecuteInBrowser } from '@openmina/shared'; import { DOCUMENT } from '@angular/common'; @Injectable() @@ -16,7 +16,9 @@ export class BenchmarksWalletsZkService { readonly updates$ = this.updates.asObservable(); loadO1js(): void { - this.loadScript(); + safelyExecuteInBrowser(() => { + this.loadScript(); + }); } sendZkApp(zkApps: BenchmarksZkapp[]): Observable { const nonce = getNonceForWallet(wallet, state).toString(); const counter = state.sentTxCount + i; - const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + localStorage.getItem('browserId'); + const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + getLocalStorage()?.getItem('browserId'); const payment = { from: wallet.publicKey, nonce, @@ -133,7 +133,7 @@ export function reducer(state: BenchmarksWalletsState = initialState, action: Be txsToSend = Array(state.txSendingBatch).fill(void 0).map((_, i: number) => { const counter = state.sentTxCount + i; - const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + localStorage.getItem('browserId'); + const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + getLocalStorage()?.getItem('browserId'); const payment = { from: wallet.publicKey, nonce: nonce.toString(), @@ -299,7 +299,7 @@ export function reducer(state: BenchmarksWalletsState = initialState, action: Be .map((wallet: BenchmarksWallet, i: number) => { const nonce = getNonceForWallet(wallet, state).toString(); const counter = state.sentTxCount + i; - const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + localStorage.getItem('browserId'); + const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + getLocalStorage()?.getItem('browserId'); return { payerPublicKey: wallet.publicKey, payerPrivateKey: wallet.privateKey, @@ -315,7 +315,7 @@ export function reducer(state: BenchmarksWalletsState = initialState, action: Be zkAppsToSend = Array(state.zkAppsSendingBatch).fill(void 0).map((_, i: number) => { const counter = state.sentTxCount + i; - const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + localStorage.getItem('browserId'); + const memo = 'S.T.' + Date.now() + ',' + (counter + 1) + ',' + getLocalStorage()?.getItem('browserId'); const payment = { payerPublicKey: wallet.publicKey, payerPrivateKey: wallet.privateKey, diff --git a/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts b/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts index 8fafa4ff04..b91a1462b6 100644 --- a/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts +++ b/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts @@ -11,7 +11,7 @@ import { ZkappCommand, } from '@shared/types/mempool/mempool-transaction.type'; import { decodeMemo, getTimeFromMemo, removeUnicodeEscapes } from '@shared/helpers/transaction.helper'; -import { ONE_BILLION } from '@openmina/shared'; +import { getLocalStorage, ONE_BILLION } from '@openmina/shared'; import { MempoolTransactionResponseKind } from '@app/features/mempool/mempool.service'; export const WALLETS: { privateKey: string, publicKey: string }[] = [ @@ -4029,8 +4029,8 @@ export class BenchmarksWalletsService { private client: Client = new Client({ network: 'testnet' }); constructor(private rust: RustService) { - if (!localStorage.getItem('browserId')) { - localStorage.setItem('browserId', Math.floor(Math.random() * 999999999).toString()); + if (!getLocalStorage()?.getItem('browserId')) { + getLocalStorage()?.setItem('browserId', Math.floor(Math.random() * 999999999).toString()); } } @@ -4120,7 +4120,7 @@ export class BenchmarksWalletsService { memo: removeUnicodeEscapes(memo), transactionData: tx, sentFromStressingTool: memo.includes('S.T.'), - sentByMyBrowser: memo.includes(localStorage.getItem('browserId')), + sentByMyBrowser: memo.includes(getLocalStorage()?.getItem('browserId')), } as MempoolTransaction; case MempoolTransactionResponseKind.ZkappCommand: const zkTx = command as ZkappCommand; @@ -4133,7 +4133,7 @@ export class BenchmarksWalletsService { memo: removeUnicodeEscapes(zkMemo), transactionData: zkTx, sentFromStressingTool: zkMemo.includes('S.T.'), - sentByMyBrowser: zkMemo.includes(localStorage.getItem('browserId')), + sentByMyBrowser: zkMemo.includes(getLocalStorage()?.getItem('browserId')), } as MempoolTransaction; } diff --git a/frontend/src/app/features/block-production/overview/block-production-overview.component.ts b/frontend/src/app/features/block-production/overview/block-production-overview.component.ts index 5fec6775a5..770b06a8b1 100644 --- a/frontend/src/app/features/block-production/overview/block-production-overview.component.ts +++ b/frontend/src/app/features/block-production/overview/block-production-overview.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, ElementRef, OnDestroy, OnInit } from '@angular/core'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { BlockProductionOverviewActions } from '@block-production/overview/block-production-overview.actions'; -import { getMergedRoute, isDesktop, MergedRoute } from '@openmina/shared'; +import { getMergedRoute, isDesktop, MergedRoute, safelyExecuteInBrowser } from '@openmina/shared'; import { debounceTime, filter, fromEvent, skip, take } from 'rxjs'; import { isNaN } from 'mathjs'; import { untilDestroyed } from '@ngneat/until-destroy'; @@ -64,16 +64,18 @@ export class BlockProductionOverviewComponent extends StoreDispatcher implements } private listenToResize(): void { - fromEvent(window, 'resize') - .pipe( - debounceTime(100), - filter(() => this.showSidePanel !== isDesktop()), - untilDestroyed(this), - ) - .subscribe(() => { - this.showSidePanel = isDesktop(); - this.detect(); - }); + safelyExecuteInBrowser(() => { + fromEvent(window, 'resize') + .pipe( + debounceTime(100), + filter(() => this.showSidePanel !== isDesktop()), + untilDestroyed(this), + ) + .subscribe(() => { + this.showSidePanel = isDesktop(); + this.detect(); + }); + }); } override ngOnDestroy(): void { diff --git a/frontend/src/app/features/block-production/overview/slot-details/block-production-overview-slot-details.component.ts b/frontend/src/app/features/block-production/overview/slot-details/block-production-overview-slot-details.component.ts index fda854dbd3..788621a3e6 100644 --- a/frontend/src/app/features/block-production/overview/slot-details/block-production-overview-slot-details.component.ts +++ b/frontend/src/app/features/block-production/overview/slot-details/block-production-overview-slot-details.component.ts @@ -6,6 +6,7 @@ import { AppSelectors } from '@app/app.state'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { AppNodeDetails } from '@shared/types/app/app-node-details.type'; import { filter } from 'rxjs'; +import { safelyExecuteInBrowser } from '@openmina/shared'; @Component({ selector: 'mina-block-production-overview-slot-details', @@ -32,6 +33,6 @@ export class BlockProductionOverviewSlotDetailsComponent extends StoreDispatcher viewInMinaExplorer(): void { const network = this.minaExplorer !== 'mainnet' ? (this.minaExplorer + '.') : ''; const url = `https://${network}minaexplorer.com/block/${this.activeSlot.hash}`; - window.open(url, '_blank'); + safelyExecuteInBrowser(() => window.open(url, '_blank')); } } diff --git a/frontend/src/app/features/block-production/overview/slots/block-production-overview-slots.component.ts b/frontend/src/app/features/block-production/overview/slots/block-production-overview-slots.component.ts index 0e3b5e325c..32149d6196 100644 --- a/frontend/src/app/features/block-production/overview/slots/block-production-overview-slots.component.ts +++ b/frontend/src/app/features/block-production/overview/slots/block-production-overview-slots.component.ts @@ -13,7 +13,7 @@ import { BlockProductionOverviewFilters, } from '@shared/types/block-production/overview/block-production-overview-filters.type'; import { untilDestroyed } from '@ngneat/until-destroy'; -import { ONE_THOUSAND, toReadableDate } from '@openmina/shared'; +import { ONE_THOUSAND, safelyExecuteInBrowser, toReadableDate } from '@openmina/shared'; import { BlockProductionOverviewActions } from '@block-production/overview/block-production-overview.actions'; import { Router } from '@angular/router'; import { Routes } from '@shared/enums/routes.enum'; @@ -211,7 +211,10 @@ export class BlockProductionOverviewSlotsComponent extends StoreDispatcher imple let desiredLeft = Math.min(nodeRect.left + nodeRect.width / 2 - tooltipWidth / 2, chartLeft + this.width - tooltipWidth); desiredLeft = Math.max(desiredLeft, chartLeft); - let desiredTop = nodeRect.bottom + window.scrollY + 12; + let desiredTop = 0; + safelyExecuteInBrowser(() => { + desiredTop = nodeRect.bottom + window.scrollY + 12; + }); if (desiredTop + tooltipHeight > chartBottom) { desiredTop = nodeRect.top - tooltipHeight - 12; } diff --git a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts index 6183ba1631..14762e01ae 100644 --- a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts +++ b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts @@ -20,7 +20,7 @@ import { hasValue, isMobile, noMillisFormat, - ONE_THOUSAND, + ONE_THOUSAND, safelyExecuteInBrowser, SecDurationConfig, toReadableDate, } from '@openmina/shared'; @@ -119,7 +119,7 @@ export class BlockProductionWonSlotsSidePanelComponent extends StoreDispatcher i viewInMinaExplorer(): void { const network = this.minaExplorer !== 'mainnet' ? (this.minaExplorer + '.') : ''; const url = `https://${network}minaexplorer.com/block/${this.slot.hash}`; - window.open(url, '_blank'); + safelyExecuteInBrowser(() => window.open(url, '_blank')); } private get getVrfText(): string { diff --git a/frontend/src/app/features/mempool/mempool.service.ts b/frontend/src/app/features/mempool/mempool.service.ts index 649d0ff0c1..fba1975c0b 100644 --- a/frontend/src/app/features/mempool/mempool.service.ts +++ b/frontend/src/app/features/mempool/mempool.service.ts @@ -8,7 +8,7 @@ import { ZkappCommand, } from '@shared/types/mempool/mempool-transaction.type'; import { decodeMemo, removeUnicodeEscapes } from '@shared/helpers/transaction.helper'; -import { ONE_BILLION } from '@openmina/shared'; +import { getLocalStorage, ONE_BILLION } from '@openmina/shared'; @Injectable({ providedIn: 'root', @@ -39,7 +39,7 @@ export class MempoolService { memo: removeUnicodeEscapes(memo), transactionData: tx.data[1], sentFromStressingTool: memo.includes('S.T.'), - sentByMyBrowser: memo.includes(localStorage.getItem('browserId')), + sentByMyBrowser: memo.includes(getLocalStorage()?.getItem('browserId')), } as MempoolTransaction; case MempoolTransactionResponseKind.ZkappCommand: const zkapp = tx.data[1] as ZkappCommand; @@ -54,7 +54,7 @@ export class MempoolService { memo: removeUnicodeEscapes(zkMemo), transactionData: tx.data[1], sentFromStressingTool: zkMemo.includes('S.T.'), - sentByMyBrowser: zkMemo.includes(localStorage.getItem('browserId')), + sentByMyBrowser: zkMemo.includes(getLocalStorage()?.getItem('browserId')), } as MempoolTransaction; } }); diff --git a/frontend/src/app/features/network/messages/network-messages-side-panel/network-messages-side-panel.component.ts b/frontend/src/app/features/network/messages/network-messages-side-panel/network-messages-side-panel.component.ts index a8e044d207..5b90dbc1b3 100644 --- a/frontend/src/app/features/network/messages/network-messages-side-panel/network-messages-side-panel.component.ts +++ b/frontend/src/app/features/network/messages/network-messages-side-panel/network-messages-side-panel.component.ts @@ -8,7 +8,7 @@ import { selectNetworkFullMessage, selectNetworkMessageHex, } from '@network/messages/network-messages.state'; -import { downloadJson, downloadJsonFromURL, ExpandTracking, MinaJsonViewerComponent } from '@openmina/shared'; +import { downloadJson, downloadJsonFromURL, ExpandTracking, MinaJsonViewerComponent, safelyExecuteInBrowser } from '@openmina/shared'; import { filter } from 'rxjs'; import { Router } from '@angular/router'; import { Routes } from '@shared/enums/routes.enum'; @@ -154,6 +154,8 @@ export class NetworkMessagesSidePanelComponent extends StoreDispatcher implement } copyToClipboard(): void { - this.clipboard.copy(window.location.href); + safelyExecuteInBrowser(() => { + this.clipboard.copy(window.location.href); + }); } } diff --git a/frontend/src/app/features/network/splits/dashboard-splits-graph/dashboard-splits-graph.component.ts b/frontend/src/app/features/network/splits/dashboard-splits-graph/dashboard-splits-graph.component.ts index 755b73c63e..1f290c00dc 100644 --- a/frontend/src/app/features/network/splits/dashboard-splits-graph/dashboard-splits-graph.component.ts +++ b/frontend/src/app/features/network/splits/dashboard-splits-graph/dashboard-splits-graph.component.ts @@ -16,6 +16,7 @@ import { DashboardSplitsSet } from '@shared/types/network/splits/dashboard-split import { DashboardSplitsSetActivePeer } from '@network/splits/dashboard-splits.actions'; import { eigs } from 'mathjs'; import * as math from 'mathjs'; +import { getLocalStorage } from '@openmina/shared'; type DashboardSplitsPeerSimulation = DashboardSplitsPeer & SimulationNodeDatum; type DashboardSplitsLinkSimulation = { @@ -128,7 +129,7 @@ export class DashboardSplitsGraphComponent extends StoreDispatcher implements On console.log('Laplacian Matrix:', laplacianMatrix); // check is same as localstorage - let item = localStorage.getItem('laplacianMatrix'); + let item = getLocalStorage()?.getItem('laplacianMatrix'); if (item) { let storedMatrix = JSON.parse(item); let storedMatrixString = JSON.stringify(storedMatrix); @@ -139,7 +140,7 @@ export class DashboardSplitsGraphComponent extends StoreDispatcher implements On console.log('Laplacian Matrix is different from the stored one'); } } - localStorage.setItem('laplacianMatrix', JSON.stringify(laplacianMatrix)); + getLocalStorage()?.setItem('laplacianMatrix', JSON.stringify(laplacianMatrix)); const computeEigenvalues = async (matrix: number[][]): Promise => { return eigs(matrix).values as number[]; diff --git a/frontend/src/app/features/resources/memory/memory-resources-table/memory-resources-table.component.ts b/frontend/src/app/features/resources/memory/memory-resources-table/memory-resources-table.component.ts index 580f13caa1..c2b28d784b 100644 --- a/frontend/src/app/features/resources/memory/memory-resources-table/memory-resources-table.component.ts +++ b/frontend/src/app/features/resources/memory/memory-resources-table/memory-resources-table.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Inject, OnDestroy } from '@angular/core'; import { MinaTableRustWrapper } from '@shared/base-classes/mina-table-rust-wrapper.class'; -import { TableColumnList, TooltipPosition } from '@openmina/shared'; +import { isBrowser, TableColumnList, TooltipPosition } from '@openmina/shared'; import { MemoryResource } from '@shared/types/resources/memory/memory-resource.type'; import { selectMemoryResourcesActiveResource } from '@resources/memory/memory-resources.state'; import { MemoryResourcesSetActiveResource } from '@resources/memory/memory-resources.actions'; @@ -16,7 +16,7 @@ import { DOCUMENT } from '@angular/common'; export class MemoryResourcesTableComponent extends MinaTableRustWrapper implements OnDestroy { activeResource: MemoryResource; - tooltipWidth: number = Math.max(window.innerWidth - 40, 1500); + tooltipWidth: number = isBrowser() ? Math.max(window.innerWidth - 40, 1500) : 0; position: TooltipPosition = TooltipPosition.RIGHT; protected readonly tableHeads: TableColumnList = [ diff --git a/frontend/src/app/features/resources/memory/memory-resources-treemap/memory-resources-treemap.component.ts b/frontend/src/app/features/resources/memory/memory-resources-treemap/memory-resources-treemap.component.ts index 6cf4e6ef52..538d5f0777 100644 --- a/frontend/src/app/features/resources/memory/memory-resources-treemap/memory-resources-treemap.component.ts +++ b/frontend/src/app/features/resources/memory/memory-resources-treemap/memory-resources-treemap.component.ts @@ -32,7 +32,7 @@ import { ResourcesSizePipe } from '@resources/memory/memory-resources.pipe'; import { MemoryResourcesSetActiveResource } from '@resources/memory/memory-resources.actions'; import { untilDestroyed } from '@ngneat/until-destroy'; import { TreemapView } from '@shared/types/resources/memory/treemap-view.type'; -import { isDesktop, TooltipService } from '@openmina/shared'; +import { isDesktop, safelyExecuteInBrowser, TooltipService } from '@openmina/shared'; import { AppSelectors } from '@app/app.state'; @Component({ @@ -83,9 +83,11 @@ export class MemoryResourcesTreemapComponent extends StoreDispatcher implements private listenToResizeEvent(): void { this.ngZone.runOutsideAngular(() => { - fromEvent(window, 'resize') - .pipe(untilDestroyed(this), debounceTime(200)) - .subscribe(() => this.redrawChart()); + safelyExecuteInBrowser(() => + fromEvent(window, 'resize') + .pipe(untilDestroyed(this), debounceTime(200)) + .subscribe(() => this.redrawChart()), + ); this.select( AppSelectors.menu, () => this.redrawChart(), @@ -358,7 +360,10 @@ export class MemoryResourcesTreemapComponent extends StoreDispatcher implements const x = event.clientX - tooltipWidth / 2 + xMargin; const y = event.clientY + yMargin; - const maxX = window.innerWidth - tooltipWidth - xMargin; + let maxX = 0; + safelyExecuteInBrowser(() => { + maxX = window.innerWidth - tooltipWidth - xMargin; + }); if (x > maxX) { this.tooltip.style.left = maxX + 'px'; } else { diff --git a/frontend/src/app/features/resources/memory/memory-resources.reducer.ts b/frontend/src/app/features/resources/memory/memory-resources.reducer.ts index 9d4978bbcb..df61e6ff4e 100644 --- a/frontend/src/app/features/resources/memory/memory-resources.reducer.ts +++ b/frontend/src/app/features/resources/memory/memory-resources.reducer.ts @@ -8,13 +8,14 @@ import { MemoryResourcesActions, } from '@resources/memory/memory-resources.actions'; import { TreemapView } from '@shared/types/resources/memory/treemap-view.type'; +import { getLocalStorage, nanOrElse } from '@openmina/shared'; const initialState: MemoryResourcesState = { resource: undefined, activeResource: undefined, breadcrumbs: [], - granularity: Number(localStorage.getItem('memory-granularity')) || 512, - treemapView: localStorage.getItem('memory-view') as TreemapView || TreemapView.BINARY, + granularity: nanOrElse(Number(getLocalStorage()?.getItem('memory-granularity')), 512), + treemapView: getLocalStorage()?.getItem('memory-view') as TreemapView || TreemapView.BINARY, }; export function memoryResourcesReducer(state: MemoryResourcesState = initialState, action: MemoryResourcesActions): MemoryResourcesState { @@ -51,7 +52,7 @@ export function memoryResourcesReducer(state: MemoryResourcesState = initialStat } case MEMORY_RESOURCES_SET_GRANULARITY: { - localStorage.setItem('memory-granularity', String(action.payload)); + getLocalStorage()?.setItem('memory-granularity', String(action.payload)); return { ...state, granularity: action.payload, @@ -62,7 +63,7 @@ export function memoryResourcesReducer(state: MemoryResourcesState = initialStat } case MEMORY_RESOURCES_SET_TREEMAP_VIEW: { - localStorage.setItem('memory-view', String(action.payload)); + getLocalStorage()?.setItem('memory-view', String(action.payload)); return { ...state, treemapView: action.payload, diff --git a/frontend/src/app/features/snarks/scan-state/scan-state-side-panel/scan-state-side-panel.component.ts b/frontend/src/app/features/snarks/scan-state/scan-state-side-panel/scan-state-side-panel.component.ts index 68ca64921b..da9442c169 100644 --- a/frontend/src/app/features/snarks/scan-state/scan-state-side-panel/scan-state-side-panel.component.ts +++ b/frontend/src/app/features/snarks/scan-state/scan-state-side-panel/scan-state-side-panel.component.ts @@ -11,6 +11,7 @@ import { TemplatePortal } from '@angular/cdk/portal'; import { ScanStateLeaf } from '@shared/types/snarks/scan-state/scan-state-leaf.type'; import { AppSelectors } from '@app/app.state'; import { getFeaturesConfig } from '@shared/constants/config'; +import { getWindow } from '@openmina/shared'; @Component({ selector: 'mina-scan-state-side-panel', @@ -124,8 +125,8 @@ export class ScanStateSidePanelComponent extends StoreDispatcher implements OnIn goToWorkPool(): void { const queryParams = this.router.parseUrl(this.router.url).queryParams; - let url = `${window.location.origin}/${Routes.SNARKS}/${Routes.WORK_POOL}/${this.activeLeaf.bundle_job_id}`; + let url = `${getWindow()?.location.origin}/${Routes.SNARKS}/${Routes.WORK_POOL}/${this.activeLeaf.bundle_job_id}`; url += `?node=${queryParams['node']}`; - window.open(url, '_blank'); + getWindow()?.open(url, '_blank'); } } diff --git a/frontend/src/app/features/snarks/scan-state/scan-state-tree-chart/scan-state-tree-chart.component.ts b/frontend/src/app/features/snarks/scan-state/scan-state-tree-chart/scan-state-tree-chart.component.ts index 3ef320c3cc..61b9bfe01b 100644 --- a/frontend/src/app/features/snarks/scan-state/scan-state-tree-chart/scan-state-tree-chart.component.ts +++ b/frontend/src/app/features/snarks/scan-state/scan-state-tree-chart/scan-state-tree-chart.component.ts @@ -4,7 +4,7 @@ import { ScanStateTree } from '@shared/types/snarks/scan-state/scan-state-tree.t import { ScanStateLeaf, ScanStateLeafStatus } from '@shared/types/snarks/scan-state/scan-state-leaf.type'; import { debounceTime, delay, distinctUntilChanged, filter, fromEvent, skip, tap } from 'rxjs'; import { untilDestroyed } from '@ngneat/until-destroy'; -import { any, hasValue, isMobile } from '@openmina/shared'; +import { any, hasValue, isMobile, safelyExecuteInBrowser } from '@openmina/shared'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { ScanStateSetActiveLeaf } from '@snarks/scan-state/scan-state.actions'; import { Router } from '@angular/router'; @@ -110,9 +110,11 @@ export class ScanStateTreeChartComponent extends StoreDispatcher implements OnIn } private handleResizing(): void { - fromEvent(window, 'resize') - .pipe(untilDestroyed(this), debounceTime(200)) - .subscribe(() => this.redrawChart()); + safelyExecuteInBrowser(() => { + fromEvent(window, 'resize') + .pipe(untilDestroyed(this), debounceTime(200)) + .subscribe(() => this.redrawChart()); + }); this.select(selectScanStateSideBarResized, () => this.redrawChart(), filter(Boolean)); this.select(selectScanStateOpenSidePanel, () => this.redrawChart(), delay(400), skip(1)); this.select(AppSelectors.menu, () => this.redrawChart(), @@ -372,9 +374,11 @@ export class ScanStateTreeChartComponent extends StoreDispatcher implements OnIn const chartLeft = this.chartContainer.nativeElement.getBoundingClientRect().left; let desiredLeft = Math.min(nodeRect.left + nodeRect.width / 2 - tooltipWidth / 2, chartLeft + this.width - tooltipWidth); desiredLeft = Math.max(desiredLeft, chartLeft); - selection - .style('left', `${desiredLeft}px`) - .style('top', `${nodeRect.bottom + window.scrollY + 12}px`); + safelyExecuteInBrowser(() => { + selection + .style('left', `${desiredLeft}px`) + .style('top', `${nodeRect.bottom + window.scrollY + 12}px`); + }); } private mouseOutHandler(event: MouseEvent & { target: HTMLElement }, d: any): void { diff --git a/frontend/src/app/features/snarks/scan-state/scan-state.reducer.ts b/frontend/src/app/features/snarks/scan-state/scan-state.reducer.ts index d78d12936c..1c7832a573 100644 --- a/frontend/src/app/features/snarks/scan-state/scan-state.reducer.ts +++ b/frontend/src/app/features/snarks/scan-state/scan-state.reducer.ts @@ -10,9 +10,9 @@ import { SCAN_STATE_START, SCAN_STATE_TOGGLE_SIDE_PANEL, SCAN_STATE_TOGGLE_TREE_VIEW, - ScanStateActions + ScanStateActions, } from '@snarks/scan-state/scan-state.actions'; -import { isDesktop } from '@openmina/shared'; +import { getLocalStorage, isDesktop } from '@openmina/shared'; const initialState: ScanStateState = { block: undefined, @@ -21,7 +21,7 @@ const initialState: ScanStateState = { openSidePanel: isDesktop(), sideBarResized: 0, stream: true, - treeView: JSON.parse(localStorage.getItem('scan_state_tree_view')) || false, + treeView: JSON.parse(getLocalStorage()?.getItem('scan_state_tree_view') ?? 'false') || false, highlightSnarkPool: true, }; @@ -90,7 +90,7 @@ export function reducer(state: ScanStateState = initialState, action: ScanStateA } case SCAN_STATE_TOGGLE_TREE_VIEW: { - localStorage.setItem('scan_state_tree_view', JSON.stringify(!state.treeView)); + getLocalStorage()?.setItem('scan_state_tree_view', JSON.stringify(!state.treeView)); return { ...state, diff --git a/frontend/src/app/features/snarks/work-pool/snarks-work-pool-side-panel/snarks-work-pool-side-panel.component.ts b/frontend/src/app/features/snarks/work-pool/snarks-work-pool-side-panel/snarks-work-pool-side-panel.component.ts index cc2a04989a..3bc9a53d3c 100644 --- a/frontend/src/app/features/snarks/work-pool/snarks-work-pool-side-panel/snarks-work-pool-side-panel.component.ts +++ b/frontend/src/app/features/snarks/work-pool/snarks-work-pool-side-panel/snarks-work-pool-side-panel.component.ts @@ -7,6 +7,7 @@ import { Router } from '@angular/router'; import { Routes } from '@shared/enums/routes.enum'; import { Overlay, OverlayRef } from '@angular/cdk/overlay'; import { TemplatePortal } from '@angular/cdk/portal'; +import { getWindow } from '@openmina/shared'; @Component({ selector: 'mina-snarks-work-pool-side-panel', @@ -89,9 +90,9 @@ export class SnarksWorkPoolSidePanelComponent extends StoreDispatcher implements goToScanState(): void { const queryParams = this.router.parseUrl(this.router.url).queryParams; const jobId = this.router.url.split('/').pop().split('?')[0]; - let url = `${window.location.origin}/${Routes.SNARKS}/${Routes.SCAN_STATE}`; + let url = `${getWindow()?.location.origin}/${Routes.SNARKS}/${Routes.SCAN_STATE}`; url += `?node=${queryParams['node']}`; url += `&jobId=${jobId}`; - window.open(url, '_blank'); + getWindow()?.open(url, '_blank'); } } diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts index cc65d098fd..be3bf550ba 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts @@ -2,7 +2,7 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, OnInit, import { untilDestroyed } from '@ngneat/until-destroy'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { WebNodeService } from '@core/services/web-node.service'; -import { any, GlobalErrorHandlerService } from '@openmina/shared'; +import { any, GlobalErrorHandlerService, safelyExecuteInBrowser } from '@openmina/shared'; import { NgClass, NgForOf, NgIf, NgOptimizedImage } from '@angular/common'; import { Router } from '@angular/router'; import { getFirstFeature } from '@shared/constants/config'; @@ -13,340 +13,340 @@ import { FileProgressHelper } from '@core/helpers/file-progress.helper'; import * as d3 from 'd3'; export enum WebNodeStepStatus { - DONE, - LOADING, - PENDING, + DONE, + LOADING, + PENDING, } export interface WebNodeLoadingStep { - name: string; - loaded: boolean; - status: WebNodeStepStatus; + name: string; + loaded: boolean; + status: WebNodeStepStatus; } @Component({ - selector: 'mina-web-node-initialization', - templateUrl: './web-node-initialization.component.html', - styleUrls: ['./web-node-initialization.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - host: { class: 'flex-column h-100 w-100 align-center' }, - standalone: true, - imports: [ - NgClass, - NgIf, - NgForOf, - NgOptimizedImage, - LoadingSpinnerComponent, - ], - animations: [ - trigger('messageChange', [ - transition('* => *', [ - style({ opacity: 0, transform: 'translateY(-10px)' }), - animate('300ms ease-out', style({ opacity: 1, transform: 'translateY(0)' })), - ]), - ]), - ], + selector: 'mina-web-node-initialization', + templateUrl: './web-node-initialization.component.html', + styleUrls: ['./web-node-initialization.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'flex-column h-100 w-100 align-center' }, + standalone: true, + imports: [ + NgClass, + NgIf, + NgForOf, + NgOptimizedImage, + LoadingSpinnerComponent, + ], + animations: [ + trigger('messageChange', [ + transition('* => *', [ + style({ opacity: 0, transform: 'translateY(-10px)' }), + animate('300ms ease-out', style({ opacity: 1, transform: 'translateY(0)' })), + ]), + ]), + ], }) export class WebNodeInitializationComponent extends StoreDispatcher implements OnInit, AfterViewInit { - protected readonly WebNodeStepStatus = WebNodeStepStatus; - readonly loading: WebNodeLoadingStep[] = [ - { name: 'Setting up browser for Web Node', loaded: false, status: WebNodeStepStatus.LOADING }, - { name: 'Getting ready to produce blocks', loaded: false, status: WebNodeStepStatus.PENDING }, - { name: 'Connecting directly to Mina network', loaded: false, status: WebNodeStepStatus.PENDING }, - ]; - loadingMessage: string = ''; - downloadingMessage: string = ''; - ready: boolean = false; - hasError: boolean = false; - hasWarn: boolean = false; - errors: string[] = []; - - private stepsPercentages: number[]; - private secondStepInterval: any; - private thirdStepInterval: any; - private progress: number = 0; - private svg: any; - private progressBar: any; - private arc: any; - @ViewChild('progress', { static: true }) private chartContainer: ElementRef; - - constructor(private errorHandler: GlobalErrorHandlerService, - private webNodeService: WebNodeService, - private router: Router) { super(); } - - ngOnInit(): void { - window.dispatchEvent(new CustomEvent('startWebNode')); - any(window).testtest = []; - this.stepsPercentages = this.getStepPercentages(); - this.fetchProgress(); - this.listenToErrorIssuing(); - this.checkWebNodeProgress(); - this.fetchPeersInformation(); - } - - ngAfterViewInit(): void { - this.buildProgressBar(); - } - - private checkWebNodeProgress(): void { - this.webNodeService.webnodeProgress$.pipe(untilDestroyed(this)).subscribe((state: string) => { - if (state === 'Loaded') { - this.updateLoadingMessage('~5 seconds left'); - setTimeout(() => { - if (!this.hasError && this.loading[1].status !== WebNodeStepStatus.DONE) { - this.updateLoadingMessage('Slower than usual'); - this.hasWarn = true; - this.detect(); - } - }, 5000); - this.loading[0].loaded = true; - this.loading[0].status = WebNodeStepStatus.DONE; - this.loading[1].status = WebNodeStepStatus.LOADING; - this.advanceProgressFor2ndStep(); - } else if (state === 'Started') { - this.updateLoadingMessage('~3 seconds left'); - setTimeout(() => { - if (!this.hasError && this.loading[2].status !== WebNodeStepStatus.DONE) { - this.updateLoadingMessage('Slower than usual'); - this.hasWarn = true; - this.detect(); - } - }, 3500); - clearInterval(this.secondStepInterval); - this.loading[0].loaded = true; - this.loading[1].loaded = true; - this.loading[0].status = WebNodeStepStatus.DONE; - this.loading[1].status = WebNodeStepStatus.DONE; - this.loading[2].status = WebNodeStepStatus.LOADING; - this.advanceProgressFor3rdStep(); - } else if (state === 'Connected') { - this.updateLoadingMessage('Web Node is ready'); - clearInterval(this.thirdStepInterval); - this.loading[0].status = WebNodeStepStatus.DONE; - this.loading[1].status = WebNodeStepStatus.DONE; - this.loading[2].status = WebNodeStepStatus.DONE; - this.loading.forEach((step: WebNodeLoadingStep) => step.loaded = true); - this.goToEndProgress(); - } - this.detect(); - }); - } - - private getStepPercentages(): number[] { - // random between 65 and 80 - const first = Math.floor(Math.random() * 15) + 65; - // random between 15 and 17 - const second = Math.floor(Math.random() * 2) + 15; - const third = 100 - first - second; - return [first, second, third]; - } - - private advanceProgressFor2ndStep(): void { - // first step is done, now we are working on the second step. - // each second add 1% to the progress. - // but the second step is only 10% of the total progress. - // so never go above 10%. Stop at 9% if the second step is not done yet. - let progress = 0; - this.secondStepInterval = setInterval(() => { - if (progress < this.stepsPercentages[1] - 1) { - progress += 0.125; - this.updateProgressBar(this.stepsPercentages[0] + progress); - } - }, 75); - } - - private async advanceProgressFor3rdStep(): Promise { - // second step is done, now we are working on the third step. - // each second add 1% to the progress. - // but the third step is only 10% of the total progress. - // so never go above 10%. Stop at 9% if the third step is not done yet. - - const currentProgress = this.progress; - const targetProgress = this.stepsPercentages[0] + this.stepsPercentages[1] - 1; - // run fast 5 increments to reach the target progress - const diff = targetProgress - currentProgress; - - for (let i = 0; i < diff; i++) { - await new Promise(resolve => setTimeout(resolve, 25)); - this.updateProgressBar(currentProgress + i); - this.detect(); - } - - let progress = 0; - this.thirdStepInterval = setInterval(() => { - if (progress < this.stepsPercentages[2] - 1) { - progress += 0.125; - this.updateProgressBar(this.stepsPercentages[0] + this.stepsPercentages[1] + progress); - } - }, 75); - } - - private goToEndProgress(): void { - // increase it to 100% to make sure it's done. - // make it smooth, do a lot of increases from where it left - // to make it look like it's finishing. - - let progress = this.progress; - let interval = setInterval(() => { - if (progress <= 100) { - progress += 1; - this.updateProgressBar(progress); - } else { - clearInterval(interval); - } - }, 30); - } - - private fetchPeersInformation(): void { - timer(0, 1000).pipe( - switchMap(() => this.webNodeService.peers$), - untilDestroyed(this), - ).subscribe(); - } - - private updateLoadingMessage(message: string): void { - if (this.hasError || this.hasWarn) { - return; - } - this.loadingMessage = message; - } - - private listenToErrorIssuing(): void { - this.errorHandler.errors$ - .pipe(filter(errors => !!errors.length), untilDestroyed(this)) - .subscribe((error: string) => { - this.errors.push(error); - this.loadingMessage = error; - this.hasError = true; - this.markErrorOnD3(); - - this.detect(); - }); - } - - private fetchProgress(): void { - FileProgressHelper.progress$.pipe( - filter(Boolean), - untilDestroyed(this), - ).subscribe((progress) => { - this.downloadingMessage = `Downloading ${(progress.downloaded / 1e6).toFixed(1)} of ${(progress.totalSize / 1e6).toFixed(1)} MB`; - if (this.svg) { - const totalProgress = (progress.progress * this.stepsPercentages[0]) / 100; - this.updateProgressBar(totalProgress); - } - this.detect(); - }); - } - - goToDashboard(): void { - if (!this.ready) { - return; - } - this.router.navigate([getFirstFeature()]); - } - - private buildProgressBar(): void { - const width = this.chartContainer.nativeElement.offsetWidth; - const height = this.chartContainer.nativeElement.offsetHeight; - const barWidth = 4; - const progress = 0; - - this.svg = d3 - .select(this.chartContainer.nativeElement) - .append('svg') - .attr('width', width) - .attr('height', height); - - this.progressBar = this.svg.append('g') - .attr('transform', `translate(${width / 2}, ${height / 2})`); - - const radius = Math.min(width, height) / 2 - barWidth; - - this.progressBar.append('circle') - .attr('r', radius) - .attr('fill', 'none') - .attr('stroke', 'var(--base-tertiary2)') - .attr('stroke-width', 1); - - this.arc = d3.arc() - .innerRadius(radius - barWidth) - .outerRadius(radius) - .startAngle(0) - .endAngle(Math.PI * 2 * (progress / 100)); - - this.progressBar.append('path') - .attr('d', this.arc) - .attr('opacity', 0.8) - .attr('fill', 'url(#progress-gradient)'); - - const defs = this.svg.append('defs'); - const gradient = defs.append('linearGradient') - .attr('id', 'progress-gradient') - .attr('x1', '0%') - .attr('x2', '75%') - .attr('y1', '25%') - .attr('y2', '0%'); - - gradient.append('stop') - .attr('offset', '8%') - .attr('stop-color', '#57d7ff'); - gradient.append('stop') - .attr('offset', '60%') - .attr('stop-color', '#fda2ff'); - gradient.append('stop') - .attr('offset', '100%') - .attr('stop-color', '#ff833d'); - - this.progressBar.append('text') - .attr('text-anchor', 'middle') - .attr('alignment-baseline', 'central') - .attr('dominant-baseline', 'central') - .attr('font-size', '40px') - .attr('fill', 'var(--base-primary)') - .attr('opacity', 0.8) - .attr('dx', '-.2em') - .text((progress).toFixed(0)); - this.progressBar.append('text') - .attr('class', 'symbol') - .attr('text-anchor', 'middle') - .attr('alignment-baseline', 'central') - .attr('dominant-baseline', 'central') - .attr('font-size', '20px') - .attr('fill', 'var(--base-tertiary)') - .attr('opacity', 0.8) - .attr('dy', '-.3em') - .attr('dx', '1.5em') - .text('%'); - } - - private updateProgressBar(newProgress: number): void { - any(window).testtest.push(newProgress); - if (newProgress >= 100) { - this.ready = true; - newProgress = 100; - this.detect(); - } - this.progress = newProgress; - this.arc.endAngle(Math.PI * 2 * (newProgress / 100)); - this.progressBar - .select('path') - .attr('d', this.arc); - this.progressBar - .select('text') - .text((newProgress).toFixed(0)); - const numberOfDigits = newProgress.toFixed(0).length + 1; - this.progressBar.select('.symbol') - .attr('dx', `${numberOfDigits * 0.45}em`) - .text('%'); - } - - private markErrorOnD3(): void { - this.progressBar.select('path').attr('fill', 'var(--warn-primary)'); - this.progressBar.select('text').attr('fill', 'var(--warn-primary)'); - this.progressBar.select('.symbol').attr('fill', 'var(--warn-primary)'); - this.progressBar.select('path').attr('opacity', 0.4); - this.progressBar.select('text').attr('opacity', 0.8); - this.progressBar.select('.symbol').attr('opacity', 0.4); - } + protected readonly WebNodeStepStatus = WebNodeStepStatus; + readonly loading: WebNodeLoadingStep[] = [ + { name: 'Setting up browser for Web Node', loaded: false, status: WebNodeStepStatus.LOADING }, + { name: 'Getting ready to produce blocks', loaded: false, status: WebNodeStepStatus.PENDING }, + { name: 'Connecting directly to Mina network', loaded: false, status: WebNodeStepStatus.PENDING }, + ]; + loadingMessage: string = ''; + downloadingMessage: string = ''; + ready: boolean = false; + hasError: boolean = false; + hasWarn: boolean = false; + errors: string[] = []; + + private stepsPercentages: number[]; + private secondStepInterval: any; + private thirdStepInterval: any; + private progress: number = 0; + private svg: any; + private progressBar: any; + private arc: any; + @ViewChild('progress', { static: true }) private chartContainer: ElementRef; + + constructor(private errorHandler: GlobalErrorHandlerService, + private webNodeService: WebNodeService, + private router: Router) { super(); } + + ngOnInit(): void { + safelyExecuteInBrowser(() => { + window.dispatchEvent(new CustomEvent('startWebNode')); + }); + this.stepsPercentages = this.getStepPercentages(); + this.fetchProgress(); + this.listenToErrorIssuing(); + this.checkWebNodeProgress(); + this.fetchPeersInformation(); + } + + ngAfterViewInit(): void { + this.buildProgressBar(); + } + + private checkWebNodeProgress(): void { + this.webNodeService.webnodeProgress$.pipe(untilDestroyed(this)).subscribe((state: string) => { + if (state === 'Loaded') { + this.updateLoadingMessage('~5 seconds left'); + setTimeout(() => { + if (!this.hasError && this.loading[1].status !== WebNodeStepStatus.DONE) { + this.updateLoadingMessage('Slower than usual'); + this.hasWarn = true; + this.detect(); + } + }, 5000); + this.loading[0].loaded = true; + this.loading[0].status = WebNodeStepStatus.DONE; + this.loading[1].status = WebNodeStepStatus.LOADING; + this.advanceProgressFor2ndStep(); + } else if (state === 'Started') { + this.updateLoadingMessage('~3 seconds left'); + setTimeout(() => { + if (!this.hasError && this.loading[2].status !== WebNodeStepStatus.DONE) { + this.updateLoadingMessage('Slower than usual'); + this.hasWarn = true; + this.detect(); + } + }, 3500); + clearInterval(this.secondStepInterval); + this.loading[0].loaded = true; + this.loading[1].loaded = true; + this.loading[0].status = WebNodeStepStatus.DONE; + this.loading[1].status = WebNodeStepStatus.DONE; + this.loading[2].status = WebNodeStepStatus.LOADING; + this.advanceProgressFor3rdStep(); + } else if (state === 'Connected') { + this.updateLoadingMessage('Web Node is ready'); + clearInterval(this.thirdStepInterval); + this.loading[0].status = WebNodeStepStatus.DONE; + this.loading[1].status = WebNodeStepStatus.DONE; + this.loading[2].status = WebNodeStepStatus.DONE; + this.loading.forEach((step: WebNodeLoadingStep) => step.loaded = true); + this.goToEndProgress(); + } + this.detect(); + }); + } + + private getStepPercentages(): number[] { + // random between 65 and 80 + const first = Math.floor(Math.random() * 15) + 65; + // random between 15 and 17 + const second = Math.floor(Math.random() * 2) + 15; + const third = 100 - first - second; + return [first, second, third]; + } + + private advanceProgressFor2ndStep(): void { + // first step is done, now we are working on the second step. + // each second add 1% to the progress. + // but the second step is only 10% of the total progress. + // so never go above 10%. Stop at 9% if the second step is not done yet. + let progress = 0; + this.secondStepInterval = setInterval(() => { + if (progress < this.stepsPercentages[1] - 1) { + progress += 0.125; + this.updateProgressBar(this.stepsPercentages[0] + progress); + } + }, 75); + } + + private async advanceProgressFor3rdStep(): Promise { + // second step is done, now we are working on the third step. + // each second add 1% to the progress. + // but the third step is only 10% of the total progress. + // so never go above 10%. Stop at 9% if the third step is not done yet. + + const currentProgress = this.progress; + const targetProgress = this.stepsPercentages[0] + this.stepsPercentages[1] - 1; + // run fast 5 increments to reach the target progress + const diff = targetProgress - currentProgress; + + for (let i = 0; i < diff; i++) { + await new Promise(resolve => setTimeout(resolve, 25)); + this.updateProgressBar(currentProgress + i); + this.detect(); + } + + let progress = 0; + this.thirdStepInterval = setInterval(() => { + if (progress < this.stepsPercentages[2] - 1) { + progress += 0.125; + this.updateProgressBar(this.stepsPercentages[0] + this.stepsPercentages[1] + progress); + } + }, 75); + } + + private goToEndProgress(): void { + // increase it to 100% to make sure it's done. + // make it smooth, do a lot of increases from where it left + // to make it look like it's finishing. + + let progress = this.progress; + let interval = setInterval(() => { + if (progress <= 100) { + progress += 1; + this.updateProgressBar(progress); + } else { + clearInterval(interval); + } + }, 30); + } + + private fetchPeersInformation(): void { + timer(0, 1000).pipe( + switchMap(() => this.webNodeService.peers$), + untilDestroyed(this), + ).subscribe(); + } + + private updateLoadingMessage(message: string): void { + if (this.hasError || this.hasWarn) { + return; + } + this.loadingMessage = message; + } + + private listenToErrorIssuing(): void { + this.errorHandler.errors$ + .pipe(filter(errors => !!errors.length), untilDestroyed(this)) + .subscribe((error: string) => { + this.errors.push(error); + this.loadingMessage = error; + this.hasError = true; + this.markErrorOnD3(); + + this.detect(); + }); + } + + private fetchProgress(): void { + FileProgressHelper.progress$.pipe( + filter(Boolean), + untilDestroyed(this), + ).subscribe((progress) => { + this.downloadingMessage = `Downloading ${(progress.downloaded / 1e6).toFixed(1)} of ${(progress.totalSize / 1e6).toFixed(1)} MB`; + if (this.svg) { + const totalProgress = (progress.progress * this.stepsPercentages[0]) / 100; + this.updateProgressBar(totalProgress); + } + this.detect(); + }); + } + + goToDashboard(): void { + if (!this.ready) { + return; + } + this.router.navigate([getFirstFeature()]); + } + + private buildProgressBar(): void { + const width = this.chartContainer.nativeElement.offsetWidth; + const height = this.chartContainer.nativeElement.offsetHeight; + const barWidth = 4; + const progress = 0; + + this.svg = d3 + .select(this.chartContainer.nativeElement) + .append('svg') + .attr('width', width) + .attr('height', height); + + this.progressBar = this.svg.append('g') + .attr('transform', `translate(${width / 2}, ${height / 2})`); + + const radius = Math.min(width, height) / 2 - barWidth; + + this.progressBar.append('circle') + .attr('r', radius) + .attr('fill', 'none') + .attr('stroke', 'var(--base-tertiary2)') + .attr('stroke-width', 1); + + this.arc = d3.arc() + .innerRadius(radius - barWidth) + .outerRadius(radius) + .startAngle(0) + .endAngle(Math.PI * 2 * (progress / 100)); + + this.progressBar.append('path') + .attr('d', this.arc) + .attr('opacity', 0.8) + .attr('fill', 'url(#progress-gradient)'); + + const defs = this.svg.append('defs'); + const gradient = defs.append('linearGradient') + .attr('id', 'progress-gradient') + .attr('x1', '0%') + .attr('x2', '75%') + .attr('y1', '25%') + .attr('y2', '0%'); + + gradient.append('stop') + .attr('offset', '8%') + .attr('stop-color', '#57d7ff'); + gradient.append('stop') + .attr('offset', '60%') + .attr('stop-color', '#fda2ff'); + gradient.append('stop') + .attr('offset', '100%') + .attr('stop-color', '#ff833d'); + + this.progressBar.append('text') + .attr('text-anchor', 'middle') + .attr('alignment-baseline', 'central') + .attr('dominant-baseline', 'central') + .attr('font-size', '40px') + .attr('fill', 'var(--base-primary)') + .attr('opacity', 0.8) + .attr('dx', '-.2em') + .text((progress).toFixed(0)); + this.progressBar.append('text') + .attr('class', 'symbol') + .attr('text-anchor', 'middle') + .attr('alignment-baseline', 'central') + .attr('dominant-baseline', 'central') + .attr('font-size', '20px') + .attr('fill', 'var(--base-tertiary)') + .attr('opacity', 0.8) + .attr('dy', '-.3em') + .attr('dx', '1.5em') + .text('%'); + } + + private updateProgressBar(newProgress: number): void { + if (newProgress >= 100) { + this.ready = true; + newProgress = 100; + this.detect(); + } + this.progress = newProgress; + this.arc.endAngle(Math.PI * 2 * (newProgress / 100)); + this.progressBar + .select('path') + .attr('d', this.arc); + this.progressBar + .select('text') + .text((newProgress).toFixed(0)); + const numberOfDigits = newProgress.toFixed(0).length + 1; + this.progressBar.select('.symbol') + .attr('dx', `${numberOfDigits * 0.45}em`) + .text('%'); + } + + private markErrorOnD3(): void { + this.progressBar.select('path').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('text').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('.symbol').attr('fill', 'var(--warn-primary)'); + this.progressBar.select('path').attr('opacity', 0.4); + this.progressBar.select('text').attr('opacity', 0.8); + this.progressBar.select('.symbol').attr('opacity', 0.4); + } } diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts index df65c4988e..f7af277c05 100644 --- a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts @@ -42,3 +42,12 @@ export class WebNodeNotSupportedComponent { } } } + +function iOSversion(): number { + if (/iP(hone|od|ad)/.test(navigator.platform)) { + // supports iOS 2.0 and later: + const v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/); + return [parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || '0', 10)][0]; + } + return 0; +} diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index 33427c539d..a1b79ab680 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -50,6 +50,7 @@ export class WebnodeComponent extends StoreDispatcher implements OnInit { } private checkIfDeviceIsSupported(): void { + if (this.platform.IOS) { this.supported = false; this.isPhone = true; diff --git a/frontend/src/app/layout/toolbar/toolbar.component.ts b/frontend/src/app/layout/toolbar/toolbar.component.ts index ca4c0a4ebf..9769b631f8 100644 --- a/frontend/src/app/layout/toolbar/toolbar.component.ts +++ b/frontend/src/app/layout/toolbar/toolbar.component.ts @@ -59,7 +59,7 @@ export class ToolbarComponent extends StoreDispatcher implements OnInit { private listenToRouterChange(): void { this.select(getMergedRoute, (url: string) => { - this.title = removeParamsFromURL(url).split('/')[1]?.replace(/-/g, ' '); + this.title = removeParamsFromURL(url)?.split('/')[1]?.replace(/-/g, ' '); this.detect(); }, filter(Boolean), map((route: MergedRoute) => route.url)); } diff --git a/frontend/src/app/shared/constants/config.ts b/frontend/src/app/shared/constants/config.ts index 56f87c5709..e4d8c533e3 100644 --- a/frontend/src/app/shared/constants/config.ts +++ b/frontend/src/app/shared/constants/config.ts @@ -1,6 +1,6 @@ import { FeaturesConfig, FeatureType, MinaEnv, MinaNode } from '@shared/types/core/environment/mina-env.type'; import { environment } from '@environment/environment'; -import { hasValue } from '@openmina/shared'; +import { getOrigin, hasValue, isBrowser, safelyExecuteInBrowser } from '@openmina/shared'; export const CONFIG: Readonly = { ...environment, @@ -8,7 +8,7 @@ export const CONFIG: Readonly = { ...environment.globalConfig, graphQL: getURL(environment.globalConfig?.graphQL), }, - configs: environment.configs.map((config) => ({ + configs: !isBrowser() ? [] : environment.configs.map((config) => ({ ...config, url: getURL(config.url), memoryProfiler: getURL(config.memoryProfiler), @@ -16,13 +16,18 @@ export const CONFIG: Readonly = { })), }; -(window as any).config = CONFIG; +safelyExecuteInBrowser(() => { + (window as any).config = CONFIG; +}); export function getAvailableFeatures(config: MinaNode): FeatureType[] { return Object.keys(getFeaturesConfig(config)) as FeatureType[]; } export function getFirstFeature(config: MinaNode = CONFIG.configs[0]): FeatureType { + if (!isBrowser()) { + return '' as FeatureType; + } if (Array.isArray(config?.features)) { return config.features[0]; } @@ -48,12 +53,15 @@ export function isSubFeatureEnabled(config: MinaNode, feature: FeatureType, subF } export function getURL(pathOrUrl: string): string { - if (pathOrUrl) { - let href = new URL(pathOrUrl, origin).href; - if (href.endsWith('/')) { - href = href.slice(0, -1); + if (isBrowser()) { + if (pathOrUrl) { + let href = new URL(pathOrUrl, getOrigin()).href; + if (href.endsWith('/')) { + href = href.slice(0, -1); + } + return href; } - return href; + return pathOrUrl; } return pathOrUrl; } diff --git a/frontend/src/app/shared/helpers/ledger.helper.ts b/frontend/src/app/shared/helpers/ledger.helper.ts index 6195fe04c3..fb4d0aeefd 100644 --- a/frontend/src/app/shared/helpers/ledger.helper.ts +++ b/frontend/src/app/shared/helpers/ledger.helper.ts @@ -5,10 +5,12 @@ import { Transport, TxType, } from '@shared/types/ledger/ledger.type'; import { Buffer } from 'buffer'; -import { any } from '@openmina/shared'; +import { any, safelyExecuteInBrowser } from '@openmina/shared'; -// @ts-ignore -window.Buffer = Buffer; +safelyExecuteInBrowser(() => { + // @ts-ignore + window.Buffer = Buffer; +}); const CLA_LEDGER = 0xb0; const INS_LEDGER = { diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts index b511552cee..4325e3ef25 100644 --- a/frontend/src/environments/environment.prod.ts +++ b/frontend/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ import { MinaEnv } from '@shared/types/core/environment/mina-env.type'; -const env = (window as any).env; +const env = typeof window !== 'undefined' ? (window as any).env : {}; export const environment: Readonly = { production: true, configs: env.configs, diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index c7e94f9576..b1d86e3807 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment: Readonly = { production: false, identifier: 'Dev FE', canAddNodes: true, - showWebNodeLandingPage: true, + showWebNodeLandingPage: false, globalConfig: { features: { dashboard: [], diff --git a/frontend/src/index.html b/frontend/src/index.html index 491d401407..a890247d0c 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -2,24 +2,28 @@ - - @@ -43,19 +47,21 @@ - diff --git a/frontend/src/main.server.ts b/frontend/src/main.server.ts new file mode 100644 index 0000000000..dfb6fdb3f1 --- /dev/null +++ b/frontend/src/main.server.ts @@ -0,0 +1 @@ +export { AppServerModule as default } from './app/app.module.server'; diff --git a/frontend/src/main.ts b/frontend/src/main.ts index a55461eea9..618cc3ffbe 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -1,6 +1,6 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { AppModule } from '@app/app.module'; +import { AppModule } from './app/app.module'; import { CONFIG } from '@shared/constants/config'; import * as Sentry from '@sentry/angular'; import type { ErrorEvent } from '@sentry/types/build/types/event'; diff --git a/frontend/tsconfig.server.json b/frontend/tsconfig.server.json new file mode 100644 index 0000000000..e2ebe5a729 --- /dev/null +++ b/frontend/tsconfig.server.json @@ -0,0 +1,14 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.app.json", + "compilerOptions": { + "outDir": "./out-tsc/server", + "types": [ + "node" + ] + }, + "files": [ + "src/main.server.ts", + "server.ts" + ] +} From 1984c8048e4903dab1f42eaae2fc9a03f8155fa8 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Wed, 13 Nov 2024 18:05:49 +0200 Subject: [PATCH 050/175] Frontend - modify serving path for prod bundle (#901) --- frontend/Dockerfile | 4 ++-- frontend/src/environments/environment.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index e993ee8550..443affcf62 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update && \ apt-get install -y curl && \ rm -rf /var/lib/apt/lists/* -COPY --from=BUILD_IMAGE /app/dist/frontend /usr/local/apache2/htdocs/ +COPY --from=BUILD_IMAGE /app/dist/frontend/browser /usr/local/apache2/htdocs/ COPY --from=BUILD_IMAGE /app/httpd.conf /usr/local/apache2/conf/httpd.conf COPY docker/startup.sh /usr/local/bin/startup.sh @@ -23,4 +23,4 @@ RUN chmod +x /usr/local/bin/startup.sh ENTRYPOINT ["/usr/local/bin/startup.sh"] -CMD ["httpd-foreground"] \ No newline at end of file +CMD ["httpd-foreground"] diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index b1d86e3807..c7e94f9576 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment: Readonly = { production: false, identifier: 'Dev FE', canAddNodes: true, - showWebNodeLandingPage: false, + showWebNodeLandingPage: true, globalConfig: { features: { dashboard: [], From 0ab80a239cb40d67a7a392210a0d12d3249d816a Mon Sep 17 00:00:00 2001 From: Adrian Nagy Date: Wed, 13 Nov 2024 16:52:01 +0100 Subject: [PATCH 051/175] fix: Correct p2p secret key decryption --- Cargo.lock | 9 +- cli/src/commands/node/mod.rs | 4 +- core/Cargo.toml | 6 ++ core/src/encrypted_key.rs | 154 ++++++++++++++++++++++++++++++++ core/src/lib.rs | 3 + node/account/Cargo.toml | 3 - node/account/src/secret_key.rs | 143 ++--------------------------- p2p/Cargo.toml | 1 + p2p/src/identity/secret_key.rs | 58 +++++++++++- tests/files/accounts/libp2p-key | 1 + 10 files changed, 238 insertions(+), 144 deletions(-) create mode 100644 core/src/encrypted_key.rs create mode 100644 tests/files/accounts/libp2p-key diff --git a/Cargo.lock b/Cargo.lock index cac2cd9832..a9c88bc792 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4488,9 +4488,13 @@ dependencies = [ name = "openmina-core" version = "0.11.0" dependencies = [ + "argon2", "ark-ff", + "base64 0.22.0", "binprot", "binprot_derive", + "bs58 0.4.0", + "crypto_secretbox", "hex", "lazy_static", "md5", @@ -4505,6 +4509,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "slab", + "thiserror", "time", "tokio", "tracing", @@ -4556,10 +4561,7 @@ name = "openmina-node-account" version = "0.11.0" dependencies = [ "anyhow", - "argon2", - "base64 0.22.0", "bs58 0.4.0", - "crypto_secretbox", "hex", "lazy_static", "mina-hasher", @@ -4822,6 +4824,7 @@ version = "0.11.0" dependencies = [ "aes-gcm 0.10.3", "anyhow", + "base64 0.22.0", "binprot", "binprot_derive", "bitflags 2.4.1", diff --git a/cli/src/commands/node/mod.rs b/cli/src/commands/node/mod.rs index aa6b2897c1..1f837271ce 100644 --- a/cli/src/commands/node/mod.rs +++ b/cli/src/commands/node/mod.rs @@ -169,9 +169,9 @@ impl Node { // warning, this overrides `OPENMINA_P2P_SEC_KEY` if let (Some(key_file), Some(password)) = (&self.libp2p_keypair, &self.libp2p_password) { - match AccountSecretKey::from_encrypted_file(key_file, password) { + match SecretKey::from_encrypted_file(key_file, password) { Ok(sk) => { - node_builder.p2p_sec_key(SecretKey::from_bytes(sk.to_bytes())); + node_builder.p2p_sec_key(sk.clone()); node::core::info!( node::core::log::system_time(); summary = "read sercret key from file", diff --git a/core/Cargo.toml b/core/Cargo.toml index acc29c0767..6cc227e4c4 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -8,6 +8,7 @@ license = "Apache-2.0" lazy_static = "1.4.0" once_cell = "1" serde = { version = "1.0.147", features = ["rc"] } +serde_json = "1.0" slab = { version = "0.4.7", features = ["serde"] } tracing = { version = "0.1", features = ["std"] } sha2 = "0.10.6" @@ -20,6 +21,11 @@ md5 = "0.7.0" multihash = { version = "0.18.1", features = ["blake2b"] } openmina-macros = { path = "../macros" } openmina-fuzzer = { path = "../fuzzer", optional = true } +argon2 = { version = "0.5.3", features = ["std"] } +crypto_secretbox = { version = "0.1.1", features = ["std"] } +base64 = "0.22" +bs58 = "0.4.0" +thiserror = "1.0.37" mina-hasher = { workspace = true } mina-p2p-messages = { workspace = true } diff --git a/core/src/encrypted_key.rs b/core/src/encrypted_key.rs new file mode 100644 index 0000000000..1d5b894b79 --- /dev/null +++ b/core/src/encrypted_key.rs @@ -0,0 +1,154 @@ +use std::fs; +use std::path::Path; + +use argon2::{password_hash::SaltString, Argon2, PasswordHasher}; +use base64::Engine; +use crypto_secretbox::aead::{Aead, OsRng}; +use crypto_secretbox::{AeadCore, KeyInit, XSalsa20Poly1305}; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, Debug)] +struct Base58String(String); + +impl Base58String { + pub fn new(raw: &[u8], version: u8) -> Self { + Base58String(bs58::encode(raw).with_check_version(version).into_string()) + } + + pub fn try_decode(&self, version: u8) -> Result, EncryptionError> { + let decoded = bs58::decode(&self.0).with_check(Some(version)).into_vec()?; + Ok(decoded[1..].to_vec()) + } +} + +#[derive(Debug, thiserror::Error)] +pub enum EncryptionError { + #[error(transparent)] + SecretBox(#[from] crypto_secretbox::aead::Error), + #[error(transparent)] + ArgonError(#[from] argon2::Error), + #[error(transparent)] + PasswordHash(#[from] argon2::password_hash::Error), + #[error(transparent)] + Base58DecodeError(#[from] bs58::decode::Error), + #[error(transparent)] + CipherKeyInvalidLength(#[from] crypto_secretbox::cipher::InvalidLength), + #[error("Password hash missing after hash_password")] + HashMissing, + #[error(transparent)] + Io(#[from] std::io::Error), + #[error(transparent)] + SerdeJson(#[from] serde_json::Error), + #[error("Other: {0}")] + Other(String), +} + +#[derive(Serialize, Deserialize, Debug)] +pub struct EncryptedSecretKeyFile { + box_primitive: String, + pw_primitive: String, + nonce: Base58String, + pwsalt: Base58String, + pwdiff: (u32, u32), + ciphertext: Base58String, +} + +impl EncryptedSecretKeyFile { + pub fn new(path: impl AsRef) -> Result { + let file = fs::File::open(path)?; + Ok(serde_json::from_reader(file)?) + } +} + +fn setup_argon(pwdiff: (u32, u32)) -> Result, EncryptionError> { + let params = argon2::Params::new( + pwdiff.0 / 1024, + pwdiff.1, + argon2::Params::DEFAULT_P_COST, + None, + )?; + + Ok(Argon2::new( + argon2::Algorithm::Argon2i, + Default::default(), + params, + )) +} + +pub trait EncryptedSecretKey { + const ENCRYPTION_DATA_VERSION_BYTE: u8 = 2; + const SECRET_KEY_PREFIX_BYTE: u8 = 1; + + // Based on the ocaml implementation + const BOX_PRIMITIVE: &'static str = "xsalsa20poly1305"; + const PW_PRIMITIVE: &'static str = "argon2i"; + // Note: Only used for enryption, for decryption use the pwdiff from the file + const PW_DIFF: (u32, u32) = (134217728, 6); + + fn try_decrypt( + encrypted: &EncryptedSecretKeyFile, + password: &str, + ) -> Result, EncryptionError> { + // prepare inputs to cipher + let password = password.as_bytes(); + let pwsalt = encrypted + .pwsalt + .try_decode(Self::ENCRYPTION_DATA_VERSION_BYTE)?; + let nonce = encrypted + .nonce + .try_decode(Self::ENCRYPTION_DATA_VERSION_BYTE)?; + let ciphertext = encrypted + .ciphertext + .try_decode(Self::ENCRYPTION_DATA_VERSION_BYTE)?; + + // The argon crate's SaltString can only be built from base64 string, ocaml node encodes the salt in base58 + // So we decoded it from base58 first, then convert to base64 and lastly to SaltString + let pwsalt_encoded = base64::engine::general_purpose::STANDARD_NO_PAD.encode(pwsalt); + let salt = SaltString::from_b64(&pwsalt_encoded)?; + + let argon2 = setup_argon(encrypted.pwdiff)?; + let password_hash = argon2 + .hash_password(password, &salt)? + .hash + .ok_or(EncryptionError::HashMissing)?; + let password_bytes = password_hash.as_bytes(); + + // decrypt cipher + let cipher = XSalsa20Poly1305::new_from_slice(password_bytes)?; + let decrypted = cipher.decrypt(nonce.as_slice().into(), ciphertext.as_ref())?; + + // strip the prefix and create keypair + Ok(decrypted) + } + fn try_encrypt(key: &[u8], password: &str) -> Result { + let argon2 = setup_argon(Self::PW_DIFF)?; + + // add the prefix byt to the key + let mut key_prefixed = vec![Self::SECRET_KEY_PREFIX_BYTE]; + key_prefixed.extend(key); + + let salt = SaltString::generate(&mut OsRng); + let password_hash = argon2 + .hash_password(password.as_bytes(), &salt)? + .hash + .ok_or(EncryptionError::HashMissing)?; + + let nonce = XSalsa20Poly1305::generate_nonce(&mut OsRng); + let cipher = XSalsa20Poly1305::new_from_slice(password_hash.as_bytes())?; + + let ciphertext = cipher.encrypt(&nonce, key_prefixed.as_slice())?; + + // Same reason as in decrypt, we ned to decode the SaltString from base64 then encode it to base58 bellow + let mut salt_bytes = [0; 32]; + let salt_portion = salt.decode_b64(&mut salt_bytes)?; + + Ok(EncryptedSecretKeyFile { + box_primitive: Self::BOX_PRIMITIVE.to_string(), + pw_primitive: Self::PW_PRIMITIVE.to_string(), + nonce: Base58String::new(&nonce, Self::ENCRYPTION_DATA_VERSION_BYTE), + pwsalt: Base58String::new(salt_portion, Self::ENCRYPTION_DATA_VERSION_BYTE), + pwdiff: (argon2.params().m_cost() * 1024, argon2.params().t_cost()), + ciphertext: Base58String::new(&ciphertext, Self::ENCRYPTION_DATA_VERSION_BYTE), + }) + } +} diff --git a/core/src/lib.rs b/core/src/lib.rs index 6301073699..ad9bfe68fa 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -23,6 +23,9 @@ pub use network::NetworkConfig; mod chain_id; pub use chain_id::*; +pub mod encrypted_key; +pub use encrypted_key::*; + mod work_dir { use once_cell::sync::OnceCell; use std::path::PathBuf; diff --git a/node/account/Cargo.toml b/node/account/Cargo.toml index f25eb4a1cf..48da130afd 100644 --- a/node/account/Cargo.toml +++ b/node/account/Cargo.toml @@ -13,9 +13,6 @@ bs58 = "0.4.0" hex = "0.4.3" rand = "0.8" lazy_static = "1.4.0" -argon2 = { version = "0.5.3", features = ["std"] } -crypto_secretbox = { version = "0.1.1", features = ["std"] } -base64 = "0.22" mina-p2p-messages = { workspace = true } mina-hasher = { workspace = true } mina-signer = { workspace = true } diff --git a/node/account/src/secret_key.rs b/node/account/src/secret_key.rs index 515c7550e4..33f148122b 100644 --- a/node/account/src/secret_key.rs +++ b/node/account/src/secret_key.rs @@ -1,13 +1,10 @@ use std::{fmt, fs, path::Path, str::FromStr}; -use argon2::{password_hash::SaltString, Argon2, Params, PasswordHasher}; -use base64::Engine; -use crypto_secretbox::aead::{Aead, OsRng}; -use crypto_secretbox::{AeadCore, KeyInit, XSalsa20Poly1305}; use mina_p2p_messages::{bigint::BigInt, v2::SignatureLibPrivateKeyStableV1}; use mina_signer::seckey::SecKeyError; use mina_signer::{keypair::KeypairError, CompressedPubKey, Keypair}; use openmina_core::constants::GENESIS_PRODUCER_SK; +use openmina_core::{EncryptedSecretKey, EncryptedSecretKeyFile, EncryptionError}; use rand::{rngs::StdRng, CryptoRng, Rng, SeedableRng}; use serde::{Deserialize, Serialize}; @@ -87,8 +84,10 @@ impl AccountSecretKey { password: &str, ) -> Result { let key_file = fs::File::open(path)?; - let encrypted: EncryptedSecretKey = serde_json::from_reader(key_file)?; - encrypted.try_decrypt(password) + let encrypted: EncryptedSecretKeyFile = serde_json::from_reader(key_file)?; + let decrypted: Vec = Self::try_decrypt(&encrypted, password)?; + AccountSecretKey::from_bytes(&decrypted[1..]) + .map_err(|err| EncryptionError::Other(err.to_string())) } pub fn to_encrypted_file( @@ -101,13 +100,15 @@ impl AccountSecretKey { } let f = fs::File::create(path)?; - let encrypted = EncryptedSecretKey::encrypt(&self.to_bytes(), password)?; + let encrypted = Self::try_encrypt(&self.to_bytes(), password)?; serde_json::to_writer(f, &encrypted)?; Ok(()) } } +impl EncryptedSecretKey for AccountSecretKey {} + impl From for Keypair { fn from(value: AccountSecretKey) -> Self { value.0 @@ -170,134 +171,6 @@ impl<'de> serde::Deserialize<'de> for AccountSecretKey { } } -#[derive(Serialize, Deserialize, Debug)] -struct Base58String(String); - -impl Base58String { - pub fn new(raw: &[u8], version: u8) -> Self { - Base58String(bs58::encode(raw).with_check_version(version).into_string()) - } - - pub fn try_decode(&self, version: u8) -> Result, EncryptionError> { - let decoded = bs58::decode(&self.0).with_check(Some(version)).into_vec()?; - Ok(decoded[1..].to_vec()) - } -} - -#[derive(Debug, thiserror::Error)] -pub enum EncryptionError { - #[error(transparent)] - SecretBox(#[from] crypto_secretbox::aead::Error), - #[error(transparent)] - ArgonError(#[from] argon2::Error), - #[error(transparent)] - PasswordHash(#[from] argon2::password_hash::Error), - #[error(transparent)] - Base58DecodeError(#[from] bs58::decode::Error), - #[error(transparent)] - CipherKeyInvalidLength(#[from] crypto_secretbox::cipher::InvalidLength), - #[error("Password hash missing after hash_password")] - HashMissing, - #[error(transparent)] - Keypair(#[from] KeypairError), - #[error(transparent)] - Io(#[from] std::io::Error), - #[error(transparent)] - SerdeJson(#[from] serde_json::Error), -} - -#[derive(Serialize, Deserialize, Debug)] -struct EncryptedSecretKey { - box_primitive: String, - pw_primitive: String, - nonce: Base58String, - pwsalt: Base58String, - pwdiff: (u32, u32), - ciphertext: Base58String, -} - -impl EncryptedSecretKey { - const ENCRYPTION_DATA_VERSION_BYTE: u8 = 2; - const SECRET_KEY_PREFIX_BYTE: u8 = 1; - - // Based on the ocaml implementation - const BOX_PRIMITIVE: &'static str = "xsalsa20poly1305"; - const PW_PRIMITIVE: &'static str = "argon2i"; - // Note: Only used for enryption, for decryption use the pwdiff from the file - const PW_DIFF: (u32, u32) = (134217728, 6); - - fn setup_argon(pwdiff: (u32, u32)) -> Result, EncryptionError> { - let params = Params::new(pwdiff.0 / 1024, pwdiff.1, Params::DEFAULT_P_COST, None)?; - - Ok(Argon2::new( - argon2::Algorithm::Argon2i, - Default::default(), - params, - )) - } - - pub fn try_decrypt(&self, password: &str) -> Result { - // prepare inputs to cipher - let password = password.as_bytes(); - let pwsalt = self.pwsalt.try_decode(Self::ENCRYPTION_DATA_VERSION_BYTE)?; - let nonce = self.nonce.try_decode(Self::ENCRYPTION_DATA_VERSION_BYTE)?; - let ciphertext = self - .ciphertext - .try_decode(Self::ENCRYPTION_DATA_VERSION_BYTE)?; - - // The argon crate's SaltString can only be built from base64 string, ocaml node encodes the salt in base58 - // So we decoded it from base58 first, then convert to base64 and lastly to SaltString - let pwsalt_encoded = base64::engine::general_purpose::STANDARD_NO_PAD.encode(pwsalt); - let salt = SaltString::from_b64(&pwsalt_encoded)?; - - let argon2 = Self::setup_argon(self.pwdiff)?; - let password_hash = argon2 - .hash_password(password, &salt)? - .hash - .ok_or(EncryptionError::HashMissing)?; - let password_bytes = password_hash.as_bytes(); - - // decrypt cipher - let cipher = XSalsa20Poly1305::new_from_slice(password_bytes)?; - let decrypted = cipher.decrypt(nonce.as_slice().into(), ciphertext.as_ref())?; - - // strip the prefix and create keypair - Ok(AccountSecretKey::from_bytes(&decrypted[1..])?) - } - - pub fn encrypt(key: &[u8], password: &str) -> Result { - let argon2 = Self::setup_argon(Self::PW_DIFF)?; - - // add the prefix byt to the key - let mut key_prefixed = vec![Self::SECRET_KEY_PREFIX_BYTE]; - key_prefixed.extend(key); - - let salt = SaltString::generate(&mut OsRng); - let password_hash = argon2 - .hash_password(password.as_bytes(), &salt)? - .hash - .ok_or(EncryptionError::HashMissing)?; - - let nonce = XSalsa20Poly1305::generate_nonce(&mut OsRng); - let cipher = XSalsa20Poly1305::new_from_slice(password_hash.as_bytes())?; - - let ciphertext = cipher.encrypt(&nonce, key_prefixed.as_slice())?; - - // Same reason as in decrypt, we ned to decode the SaltString from base64 then encode it to base58 bellow - let mut salt_bytes = [0; 32]; - let salt_portion = salt.decode_b64(&mut salt_bytes)?; - - Ok(Self { - box_primitive: Self::BOX_PRIMITIVE.to_string(), - pw_primitive: Self::PW_PRIMITIVE.to_string(), - nonce: Base58String::new(&nonce, Self::ENCRYPTION_DATA_VERSION_BYTE), - pwsalt: Base58String::new(salt_portion, Self::ENCRYPTION_DATA_VERSION_BYTE), - pwdiff: (argon2.params().m_cost() * 1024, argon2.params().t_cost()), - ciphertext: Base58String::new(&ciphertext, Self::ENCRYPTION_DATA_VERSION_BYTE), - }) - } -} - #[cfg(test)] mod tests { use std::env; diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index cf4ad92f10..17e09e4a1c 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -15,6 +15,7 @@ derive_more = "0.99.17" rand = { version = "0.8", features = [ "small_rng" ] } bytes = "*" bs58 = "0.4.0" +base64 = "0.22" binprot = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } anyhow = "1.0.70" diff --git a/p2p/src/identity/secret_key.rs b/p2p/src/identity/secret_key.rs index 30254371c1..9b4b272f4f 100644 --- a/p2p/src/identity/secret_key.rs +++ b/p2p/src/identity/secret_key.rs @@ -1,6 +1,8 @@ -use std::{fmt, str::FromStr}; +use std::{fmt, path::Path, str::FromStr}; +use base64::Engine; use ed25519_dalek::SigningKey as Ed25519SecretKey; +use openmina_core::{EncryptedSecretKey, EncryptedSecretKeyFile, EncryptionError}; use rand::{CryptoRng, Rng}; use serde::{Deserialize, Serialize}; @@ -50,8 +52,48 @@ impl SecretKey { pub fn to_x25519(&self) -> x25519_dalek::StaticSecret { self.0.to_scalar_bytes().into() } + + pub fn from_encrypted_file( + path: impl AsRef, + password: &str, + ) -> Result { + let encrypted = EncryptedSecretKeyFile::new(path)?; + let decrypted = Self::try_decrypt(&encrypted, password)?; + + let keypair_string = String::from_utf8(decrypted.to_vec()) + .map_err(|e| EncryptionError::Other(e.to_string()))?; + + let parts: Vec<&str> = keypair_string.split(',').collect(); + + if parts.len() != 3 { + return Err(EncryptionError::Other( + "libp2p keypair string must have 3 parts".to_string(), + )); + } + + let (secret_key_base64, _public_key_base64, _peer_id) = (parts[0], parts[1], parts[2]); + + let key_bytes = base64::engine::general_purpose::STANDARD + .decode(secret_key_base64.as_bytes()) + .map_err(|e| EncryptionError::Other(e.to_string()))?; + + let key_bytes = key_bytes[4..36] + .try_into() + .map_err(|_| EncryptionError::Other("Invalid secret key length".to_string()))?; + Ok(Self::from_bytes(key_bytes)) + } + + pub fn to_encrypted_file( + &self, + _password: &str, + _path: impl AsRef, + ) -> Result<(), EncryptionError> { + todo!() + } } +impl EncryptedSecretKey for SecretKey {} + use aes_gcm::{ aead::{Aead, AeadCore}, Aes256Gcm, KeyInit, @@ -218,4 +260,18 @@ mod tests { let unparsed = sk.to_string(); assert_eq!(s, &unparsed); } + + #[test] + fn test_libp2p_key_decrypt() { + let password = "total-secure-pass"; + let key_path = "../tests/files/accounts/libp2p-key"; + + let expected_peer_id = "12D3KooWDxyuJKSsVEwNR13UVwf4PEfs4yHkk3ecZipBPv3Y3Sac"; + + let decrypted = SecretKey::from_encrypted_file(key_path, password) + .expect("Failed to decrypt secret key file"); + + let peer_id = decrypted.public_key().peer_id().to_libp2p_string(); + assert_eq!(expected_peer_id, peer_id); + } } diff --git a/tests/files/accounts/libp2p-key b/tests/files/accounts/libp2p-key new file mode 100644 index 0000000000..e5778a57b3 --- /dev/null +++ b/tests/files/accounts/libp2p-key @@ -0,0 +1 @@ +{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"7xjB1MvPCE9jBFFn5Y87GzHQaJVXBWBBtRUiCfi","pwsalt":"AhVEKpj8G6MP7gzveuRx85pJJDro","pwdiff":[134217728,6],"ciphertext":"7qt8X7ekepe4iGNpUhsLuT8j4aZNSf4jvUUPknhVbAV5Achndcw8pG333TU1ZsfC3LPz2ZWjtpGZgqEW3dGWSWDyzj4MBrwmqqAntze8L17pZJrLVmgYwdtCHqSc27FTCjcwLfaxAtDUWPNQX8S93B4DDf3TUn79BFerCfRfeSdqfNYrV9KhrC5wRF23BRnXh6A84PAgzp9bh8fnQQHJNDboQDmJ6aCdUKUbHYYYMQkkWSa7NXs9UjY7TV1szDc4vnfxiXpYmtaC85Q2H55dF3LybG12hJnzVBBcF"} \ No newline at end of file From afa511354cfc2f73389aa8460a36b7a485a0ca5a Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Wed, 13 Nov 2024 23:09:14 +0200 Subject: [PATCH 052/175] Frontend - Block production won slots improvements (#902) * Frontend - modify serving path for prod bundle * Block production won slots improvements * Web node not supported iOS * Dev mode iOS --- .../block-production-won-slots.effects.ts | 7 +++-- .../block-production-won-slots.reducer.ts | 11 +++++-- ...oduction-won-slots-side-panel.component.ts | 25 +++++----------- .../web-node-not-supported.component.html | 29 ++++--------------- .../web-node-not-supported.component.scss | 23 +++++++++++++++ .../web-node-not-supported.component.ts | 22 +++++++++----- .../app/features/webnode/webnode.component.ts | 4 +-- .../src/app/shared/helpers/webnode.helper.ts | 9 ++++++ 8 files changed, 73 insertions(+), 57 deletions(-) diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts index 6cb1e24b4f..ab027cf104 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { MinaState, selectMinaState } from '@app/app.setup'; import { Actions, createEffect, ofType } from '@ngrx/effects'; -import { Effect } from '@openmina/shared'; +import { Effect, isDesktop } from '@openmina/shared'; import { EMPTY, map, switchMap } from 'rxjs'; import { catchErrorAndRepeat2 } from '@shared/constants/store-functions'; import { MinaErrorType } from '@shared/types/error-preview/mina-error-type.enum'; @@ -47,7 +47,8 @@ export class BlockProductionWonSlotsEffects extends BaseEffect { ? EMPTY : this.wonSlotsService.getSlots().pipe( switchMap(({ slots, epoch }) => { - const activeSlotRoute = state.blockProduction[BLOCK_PRODUCTION_WON_SLOTS_KEY].activeSlotRoute; + const bpState = state.blockProduction[BLOCK_PRODUCTION_WON_SLOTS_KEY]; + const activeSlotRoute = bpState.activeSlotRoute; let newActiveSlot = slots.find(s => s.globalSlot.toString() === activeSlotRoute); if (!activeSlotRoute || (activeSlotRoute && !newActiveSlot)) { newActiveSlot = slots.find(s => s.active) @@ -56,7 +57,7 @@ export class BlockProductionWonSlotsEffects extends BaseEffect { ?? null; } const routes: string[] = [Routes.BLOCK_PRODUCTION, Routes.WON_SLOTS]; - if (newActiveSlot) { + if (newActiveSlot && isDesktop() || (activeSlotRoute && !bpState.activeSlot) || (activeSlotRoute && bpState.openSidePanel)) { routes.push(newActiveSlot.globalSlot.toString()); } return fromPromise(this.router.navigate(routes, { queryParamsHandling: 'merge' })).pipe(map(() => ({ diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts index 9243daa5f7..63fd852440 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts @@ -1,6 +1,6 @@ import { createReducer, on } from '@ngrx/store'; import { BlockProductionWonSlotsState } from '@block-production/won-slots/block-production-won-slots.state'; -import { isMobile, sort, SortDirection, TableSort } from '@openmina/shared'; +import { isDesktop, isMobile, sort, SortDirection, TableSort } from '@openmina/shared'; import { BlockProductionWonSlotsActions } from '@block-production/won-slots/block-production-won-slots.actions'; import { BlockProductionWonSlotsSlot, @@ -38,7 +38,7 @@ export const blockProductionWonSlotsReducer = createReducer( epoch, filteredSlots: filterSlots(sortSlots(slots, state.sort), state.filters), activeSlot, - openSidePanel: !!activeSlot, + openSidePanel: state.activeSlot ? state.openSidePanel : isDesktop(), })), on(BlockProductionWonSlotsActions.setActiveSlot, (state, { slot }) => ({ ...state, @@ -56,7 +56,12 @@ export const blockProductionWonSlotsReducer = createReducer( filters, filteredSlots: filterSlots(sortSlots(state.slots, state.sort), filters), })), - on(BlockProductionWonSlotsActions.toggleSidePanel, state => ({ ...state, openSidePanel: !state.openSidePanel })), + on(BlockProductionWonSlotsActions.toggleSidePanel, state => ({ + ...state, + openSidePanel: !state.openSidePanel, + activeSlot: !state.openSidePanel ? state.activeSlot : undefined, + activeSlotRoute: !state.openSidePanel ? state.activeSlotRoute : undefined, + })), on(BlockProductionWonSlotsActions.close, () => initialState), ); diff --git a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts index 14762e01ae..de74fe2848 100644 --- a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts +++ b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts @@ -1,12 +1,4 @@ -import { - ChangeDetectionStrategy, - Component, - OnDestroy, - OnInit, - TemplateRef, - ViewChild, - ViewContainerRef, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, TemplateRef, ViewChild, ViewContainerRef } from '@angular/core'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { BlockProductionWonSlotsSelectors } from '@block-production/won-slots/block-production-won-slots.state'; import { @@ -15,19 +7,13 @@ import { BlockProductionWonSlotTimes, } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; import { getTimeDiff } from '@shared/helpers/date.helper'; -import { - any, - hasValue, - isMobile, - noMillisFormat, - ONE_THOUSAND, safelyExecuteInBrowser, - SecDurationConfig, - toReadableDate, -} from '@openmina/shared'; +import { any, hasValue, isMobile, noMillisFormat, ONE_THOUSAND, safelyExecuteInBrowser, SecDurationConfig, toReadableDate } from '@openmina/shared'; import { filter } from 'rxjs'; import { BlockProductionWonSlotsActions } from '@block-production/won-slots/block-production-won-slots.actions'; import { AppSelectors } from '@app/app.state'; import { AppNodeDetails } from '@shared/types/app/app-node-details.type'; +import { Router } from '@angular/router'; +import { Routes } from '@shared/enums/routes.enum'; @Component({ selector: 'mina-block-production-won-slots-side-panel', @@ -70,6 +56,8 @@ export class BlockProductionWonSlotsSidePanelComponent extends StoreDispatcher i @ViewChild('discarded') private discardedTemplate: TemplateRef; + constructor(private router: Router) {super();} + ngOnInit(): void { this.listenToActiveSlot(); this.parseRemainingTime(); @@ -198,6 +186,7 @@ export class BlockProductionWonSlotsSidePanelComponent extends StoreDispatcher i } closeSidePanel(): void { + this.router.navigate([Routes.BLOCK_PRODUCTION, Routes.WON_SLOTS]); this.dispatch2(BlockProductionWonSlotsActions.toggleSidePanel()); } diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html index 7fa84854eb..ef3d9e3b80 100644 --- a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.html @@ -2,33 +2,16 @@
@if (isPhone) { -
-
-
Your device isn't supported
+
+
iOS
+
+
Your iOS {{ iOSVersion ?? '' }} isn't supported
- Unfortunately, iOS devices are not currently supported. -
-
- -
-
Switch to one of the following platforms
-
-
- - Windows -
-
- - Android -
-
- - MacOS -
+ To use the Web Node please update your device to the latest iOS version.
-
And use Chrome, Edge, Safari or Brave
+
} @else {
diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss index 82eeb41224..e44bc5b434 100644 --- a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.scss @@ -1,3 +1,5 @@ +@import 'openmina'; + .header { height: 56px; @@ -10,6 +12,27 @@ .browser-content { height: calc(100% - 56px); + .ios { + width: 96px; + height: 96px; + font-size: 30px; + border-radius: 100px; + } + + .ios-box { + margin-top: 40px; + margin-bottom: 40px; + padding: 0 32px; + } + + .learn-btn { + background-color: $base-background; + color: $base-primary; + max-width: 330px; + margin: 0 12px; + filter: invert(1); + } + .headline { font-size: 20px; line-height: 30px; diff --git a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts index f7af277c05..37ffb3247a 100644 --- a/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts +++ b/frontend/src/app/features/webnode/web-node-not-supported/web-node-not-supported.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { Platform } from '@angular/cdk/platform'; -import { sendSentryEvent } from '@shared/helpers/webnode.helper'; +import { iOSversion, sendSentryEvent } from '@shared/helpers/webnode.helper'; +import { safelyExecuteInBrowser } from '@openmina/shared'; const code = [1, 2, 3, 2]; @@ -19,13 +20,23 @@ export class WebNodeNotSupportedComponent { @Output() bypassUnsupportedDevice = new EventEmitter(); + iOSVersion: string = iOSversion().join('.'); devMode: boolean = false; private codeVerifier: number[] = []; constructor(private platform: Platform) {} + addDevKey2(): void { + this.codeVerifier.push(code[this.codeVerifier.length]); + this.checkCode(); + } + addDevKey(key: number): void { this.codeVerifier.push(key); + this.checkCode(); + } + + private checkCode(): void { if (this.codeVerifier.length === code.length) { if (this.codeVerifier.every((v, i) => v === code[i])) { this.devMode = true; @@ -41,13 +52,8 @@ export class WebNodeNotSupportedComponent { this.bypassUnsupportedDevice.emit(); } } -} -function iOSversion(): number { - if (/iP(hone|od|ad)/.test(navigator.platform)) { - // supports iOS 2.0 and later: - const v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/); - return [parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || '0', 10)][0]; + howToUpdate(): void { + safelyExecuteInBrowser(() => window.open('https://support.apple.com/en-us/118575', '_blank')); } - return 0; } diff --git a/frontend/src/app/features/webnode/webnode.component.ts b/frontend/src/app/features/webnode/webnode.component.ts index a1b79ab680..913ed0c4d0 100644 --- a/frontend/src/app/features/webnode/webnode.component.ts +++ b/frontend/src/app/features/webnode/webnode.component.ts @@ -6,6 +6,7 @@ import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { getMergedRoute, MergedRoute } from '@openmina/shared'; import { filter } from 'rxjs'; import { WebNodeService } from '@core/services/web-node.service'; +import { iOSversion } from '@shared/helpers/webnode.helper'; @Component({ selector: 'mina-webnode', @@ -50,9 +51,8 @@ export class WebnodeComponent extends StoreDispatcher implements OnInit { } private checkIfDeviceIsSupported(): void { - if (this.platform.IOS) { - this.supported = false; + this.supported = iOSversion()[0] >= 18; this.isPhone = true; return; } diff --git a/frontend/src/app/shared/helpers/webnode.helper.ts b/frontend/src/app/shared/helpers/webnode.helper.ts index 7a223fb132..3b9a2057f1 100644 --- a/frontend/src/app/shared/helpers/webnode.helper.ts +++ b/frontend/src/app/shared/helpers/webnode.helper.ts @@ -4,3 +4,12 @@ import { SeverityLevel } from '@sentry/angular'; export function sendSentryEvent(message: string, level: SeverityLevel = 'error'): void { Sentry.captureEvent({ message: message, level, tags: { type: 'webnode' } }); } + +export function iOSversion(): number[] { + if (/iP(hone|od|ad)/.test(navigator.platform)) { + // supports iOS 2.0 and later: + const v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/); + return [parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || '0', 10)]; + } + return [0]; +} From 3581cc561f80e7d554ca88be7d3ffb2bf03e694e Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:21:46 +0200 Subject: [PATCH 053/175] Frontend - Change mime type for wasm (#903) mime type forcing for wasm files --- frontend/httpd.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 94d2dca798..6008c20a62 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -498,6 +498,7 @@ LogLevel warn # AddType application/x-compress .Z AddType application/x-gzip .gz .tgz + AddType application/wasm .wasm # # AddHandler allows you to map certain file extensions to "handlers": From 1df4480f0ff96ad25261fee0f085ec6d69d7fff3 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sun, 3 Nov 2024 17:24:08 +0400 Subject: [PATCH 054/175] chore(testing): make separate module for server --- node/testing/src/{server.rs => server/mod.rs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename node/testing/src/{server.rs => server/mod.rs} (100%) diff --git a/node/testing/src/server.rs b/node/testing/src/server/mod.rs similarity index 100% rename from node/testing/src/server.rs rename to node/testing/src/server/mod.rs From 135493ecd07da4a86fc92be688e080b8da69a12a Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Wed, 6 Nov 2024 14:02:56 +0400 Subject: [PATCH 055/175] fix(testing/server): requests hanging --- Cargo.lock | 154 ++++++++++++++++++++++++--------- node/testing/Cargo.toml | 4 +- node/testing/src/main.rs | 2 +- node/testing/src/server/mod.rs | 11 ++- 4 files changed, 122 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9c88bc792..7140b81fa6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -535,7 +535,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http", + "http 0.2.9", "log", "url", ] @@ -571,18 +571,19 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.0", + "hyper-util", "itoa", "matchit", "memchr", @@ -594,28 +595,33 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -2405,7 +2411,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 2.0.2", "slab", "tokio", @@ -2474,7 +2480,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http", + "http 0.2.9", "httpdate", "mime", "sha1", @@ -2486,7 +2492,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.9", ] [[package]] @@ -2606,6 +2612,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -2613,15 +2630,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "pin-project-lite", ] [[package]] -name = "http-range-header" -version = "0.3.1" +name = "http-body" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] [[package]] name = "httparse" @@ -2652,8 +2686,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -2665,6 +2699,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -2672,12 +2725,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.5.0", + "pin-project-lite", + "tokio", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -2756,8 +2824,8 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.27", "log", "rand", "tokio", @@ -3857,7 +3925,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.9", "httparse", "log", "memchr", @@ -4844,7 +4912,7 @@ dependencies = [ "gloo-utils", "hex", "hkdf", - "hyper", + "hyper 0.14.27", "js-sys", "libc", "libp2p-identity", @@ -5763,9 +5831,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-tls", "ipnet", "js-sys", @@ -5779,7 +5847,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -6996,6 +7064,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.12.6" @@ -7293,17 +7367,13 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" dependencies = [ "bitflags 2.4.1", "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", + "http 1.1.0", "pin-project-lite", "tower-layer", "tower-service", @@ -7311,9 +7381,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" @@ -7515,7 +7585,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", "rand", @@ -7847,8 +7917,8 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.27", "log", "mime", "mime_guess", diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml index c96457c74c..586281d45f 100644 --- a/node/testing/Cargo.toml +++ b/node/testing/Cargo.toml @@ -24,8 +24,8 @@ rand = "0.8" tokio = { version = "1.26.0" } num_cpus = "1.0" rayon = "1.5" -axum = "0.6" -tower-http = { version = "0.4.4", features = ["cors"] } +axum = "0.7" +tower-http = { version = "0.6", features = ["cors"] } strum = "0.26" strum_macros = "0.26" tracing-log = "0.2.0" diff --git a/node/testing/src/main.rs b/node/testing/src/main.rs index bd51d5a7e0..53b0c694ca 100644 --- a/node/testing/src/main.rs +++ b/node/testing/src/main.rs @@ -66,7 +66,7 @@ impl Command { match self { Self::Server(args) => { - server(args.port); + server(rt, args.port); Ok(()) } Self::ScenariosGenerate(cmd) => { diff --git a/node/testing/src/server/mod.rs b/node/testing/src/server/mod.rs index 23f494a73e..dc6028ec24 100644 --- a/node/testing/src/server/mod.rs +++ b/node/testing/src/server/mod.rs @@ -13,10 +13,12 @@ use axum::{ }; use rand::{rngs::StdRng, Rng, SeedableRng}; use serde::{Deserialize, Serialize}; +use tokio::net::TcpListener; +use tokio::runtime::Runtime; use tokio::sync::{oneshot, Mutex, MutexGuard, OwnedMutexGuard}; use tower_http::cors::CorsLayer; -pub fn server(port: u16) { +pub fn server(rt: Runtime, port: u16) { eprintln!("scenarios path: {}", Scenario::PATH); let state = AppState::new(); @@ -56,9 +58,10 @@ pub fn server(port: u16) { .with_state(state) .layer(cors); - tokio::runtime::Handle::current().block_on(async { - axum::Server::bind(&([0, 0, 0, 0], port).into()) - .serve(app.into_make_service()) + rt.block_on(async { + let addr = std::net::SocketAddr::from(([0, 0, 0, 0], port)); + let listener = TcpListener::bind(addr).await.unwrap(); + axum::serve(listener, app.into_make_service()) .await .unwrap(); }); From 3f02fc2d08fad560acbccacd9c8d34b71138c89e Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Thu, 7 Nov 2024 02:41:33 +0400 Subject: [PATCH 056/175] feat(testing/server): expose api to create custom cluster/chain, get seeds and genesis_config for that cluster re: #867 --- node/account/src/secret_key.rs | 2 +- node/native/src/node/builder.rs | 2 - .../transition_frontier_genesis_config.rs | 43 ++++++++- node/testing/src/cluster/config.rs | 12 ++- node/testing/src/cluster/mod.rs | 1 - node/testing/src/cluster/runner/mod.rs | 4 +- node/testing/src/cluster/runner/run.rs | 3 +- node/testing/src/node/rust/config.rs | 28 +++--- node/testing/src/scenarios/mod.rs | 2 +- .../basic_connectivity_initial_joining.rs | 3 +- .../basic_connectivity_peer_discovery.rs | 1 - .../scenarios/multi_node/pubsub_advanced.rs | 2 +- .../multi_node/vrf_correct_ledgers.rs | 1 - .../scenarios/multi_node/vrf_correct_slots.rs | 1 - .../vrf_epoch_bounds_correct_ledgers.rs | 1 - .../multi_node/vrf_epoch_bounds_evaluation.rs | 1 - node/testing/src/scenarios/p2p/pubsub.rs | 2 - .../record_replay/block_production.rs | 2 +- .../testing/src/scenarios/simulation/small.rs | 2 +- .../simulation/small_forever_real_time.rs | 2 +- .../basic_connectivity_accept_incoming.rs | 1 - .../basic_connectivity_initial_joining.rs | 1 - .../scenarios/solo_node/sync_to_genesis.rs | 1 - .../solo_node/sync_to_genesis_custom.rs | 1 - node/testing/src/server/mod.rs | 91 +++++++++++++++++++ node/testing/src/server/simulator.rs | 87 ++++++++++++++++++ node/testing/src/simulator/config.rs | 11 ++- node/testing/src/simulator/mod.rs | 23 ++++- node/web/src/node/builder.rs | 1 - p2p/src/p2p_config.rs | 4 - p2p/testing/src/cluster.rs | 1 - 31 files changed, 283 insertions(+), 54 deletions(-) create mode 100644 node/testing/src/server/simulator.rs diff --git a/node/account/src/secret_key.rs b/node/account/src/secret_key.rs index 33f148122b..40912149fd 100644 --- a/node/account/src/secret_key.rs +++ b/node/account/src/secret_key.rs @@ -23,7 +23,7 @@ lazy_static::lazy_static! { // TODO(binier): better way. static ref GENERATED_DETERMINISTIC: Vec = { let mut rng = StdRng::seed_from_u64(0); - (0..1000) + (0..10000) .map(|_| AccountSecretKey::rand_with(&mut rng)) .collect() }; diff --git a/node/native/src/node/builder.rs b/node/native/src/node/builder.rs index dfe21a6406..069021e4d1 100644 --- a/node/native/src/node/builder.rs +++ b/node/native/src/node/builder.rs @@ -4,7 +4,6 @@ use std::{ net::IpAddr, path::Path, sync::Arc, - time::Duration, }; use anyhow::Context; @@ -326,7 +325,6 @@ impl NodeBuilder { identity_pub_key: p2p_sec_key.public_key(), initial_peers, external_addrs, - ask_initial_peers_interval: Duration::from_secs(3600), enabled_channels: ChannelId::iter_all().collect(), peer_discovery: !self.p2p_no_discovery, meshsub: P2pMeshsubConfig { diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs index 4ae9444824..911c138539 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs @@ -33,6 +33,7 @@ use crate::{ pub use GenesisConfig as TransitionFrontierGenesisConfig; #[derive(Serialize, Deserialize, Debug, Clone)] +#[serde(tag = "kind")] pub enum GenesisConfig { Counts { whales: usize, @@ -78,7 +79,10 @@ pub struct GenesisConfigLoaded { } fn bp_num_delegators(i: usize) -> usize { - (i.saturating_add(1)).checked_mul(2).expect("overflow") + (i.saturating_add(1)) + .checked_mul(2) + .expect("overflow") + .min(32) } #[derive(Debug, thiserror::Error)] @@ -636,6 +640,43 @@ impl PrebuiltGenesisConfig { masks.push(staking_ledger_mask); Ok((masks, load_result)) } + + pub fn from_loaded( + (masks, data): (Vec, GenesisConfigLoaded), + ) -> Result { + let find_mask_by_hash = |hash: &v2::LedgerHash| { + masks + .iter() + .find(|&m| m.clone().merkle_root() == hash.to_field().unwrap()) + .ok_or(()) + }; + let inner_hashes = |mask: &ledger::Mask| { + mask.get_raw_inner_hashes() + .into_iter() + .map(|(idx, hash)| (idx, v2::LedgerHash::from_fp(hash))) + .collect() + }; + let genesis_mask = find_mask_by_hash(&data.genesis_ledger_hash)?; + let epoch_data = |hash: v2::LedgerHash, seed: v2::EpochSeed| { + find_mask_by_hash(&hash).map(|mask| PrebuiltGenesisEpochData { + accounts: mask.to_list().into_iter().map(Into::into).collect(), + ledger_hash: hash, + hashes: inner_hashes(mask), + seed, + }) + }; + Ok(Self { + constants: data.constants, + accounts: genesis_mask.to_list().into_iter().map(Into::into).collect(), + ledger_hash: data.genesis_ledger_hash, + hashes: inner_hashes(genesis_mask), + staking_epoch_data: epoch_data( + data.staking_epoch_ledger_hash, + data.staking_epoch_seed, + )?, + next_epoch_data: epoch_data(data.next_epoch_ledger_hash, data.next_epoch_seed)?, + }) + } } #[derive(Debug, Serialize, Deserialize, BinProtRead, BinProtWrite)] diff --git a/node/testing/src/cluster/config.rs b/node/testing/src/cluster/config.rs index 0a815b006e..30c0abb527 100644 --- a/node/testing/src/cluster/config.rs +++ b/node/testing/src/cluster/config.rs @@ -4,11 +4,15 @@ use crate::node::OcamlNodeExecutable; #[derive(Serialize, Deserialize, Debug, Clone)] pub struct ClusterConfig { + #[serde(default)] port_range: Option<(u16, u16)>, all_rust_to_rust_use_webrtc: bool, proof_kind: ProofKind, + #[serde(default)] is_replay: bool, + #[serde(default)] use_debugger: bool, + #[serde(default)] ocaml_node_executable: Option, } @@ -21,8 +25,7 @@ pub enum ProofKind { impl Default for ProofKind { fn default() -> Self { - // TODO(binier): change default to `ConstraintsChecked` once - // https://github.com/openmina/openmina/issues/260 is closed + // once it's working, change to Self::ConstraintsChecked Self::Dummy } } @@ -72,6 +75,11 @@ impl ClusterConfig { self.all_rust_to_rust_use_webrtc } + pub fn set_proof_kind(&mut self, kind: ProofKind) -> &mut Self { + self.proof_kind = kind; + self + } + pub fn proof_kind(&self) -> ProofKind { self.proof_kind } diff --git a/node/testing/src/cluster/mod.rs b/node/testing/src/cluster/mod.rs index 69f976b924..0163b855c1 100644 --- a/node/testing/src/cluster/mod.rs +++ b/node/testing/src/cluster/mod.rs @@ -282,7 +282,6 @@ impl Cluster { identity_pub_key: p2p_sec_key.public_key(), initial_peers, external_addrs: vec![], - ask_initial_peers_interval: testing_config.ask_initial_peers_interval, enabled_channels: ChannelId::iter_all().collect(), peer_discovery: true, timeouts: testing_config.timeouts, diff --git a/node/testing/src/cluster/runner/mod.rs b/node/testing/src/cluster/runner/mod.rs index 163fe717e1..c21d37210b 100644 --- a/node/testing/src/cluster/runner/mod.rs +++ b/node/testing/src/cluster/runner/mod.rs @@ -23,7 +23,7 @@ use crate::{ pub struct ClusterRunner<'a> { cluster: &'a mut Cluster, - add_step: Box, + add_step: Box, rng: StdRng, latest_advance_time: Option, } @@ -31,7 +31,7 @@ pub struct ClusterRunner<'a> { impl<'a> ClusterRunner<'a> { pub fn new(cluster: &'a mut Cluster, add_step: F) -> Self where - F: 'a + FnMut(&ScenarioStep), + F: 'a + Send + FnMut(&ScenarioStep), { Self { cluster, diff --git a/node/testing/src/cluster/runner/run.rs b/node/testing/src/cluster/runner/run.rs index ca5aa9c609..057497d8df 100644 --- a/node/testing/src/cluster/runner/run.rs +++ b/node/testing/src/cluster/runner/run.rs @@ -23,12 +23,13 @@ pub struct RunCfg< advance_time: Option, } -#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone)] +#[derive(derive_more::From, Serialize, Deserialize, Debug, Default, Clone)] pub enum RunCfgAdvanceTime { /// Set the range of time in milliseconds, with which time will be /// advanced during `run` function execution. Rand(std::ops::RangeInclusive), /// Advance time so that node's time matches the real time. + #[default] Real, } diff --git a/node/testing/src/node/rust/config.rs b/node/testing/src/node/rust/config.rs index 1022004f7e..4754ebad74 100644 --- a/node/testing/src/node/rust/config.rs +++ b/node/testing/src/node/rust/config.rs @@ -1,6 +1,6 @@ use std::fs::File; use std::path::Path; -use std::{sync::Arc, time::Duration}; +use std::sync::Arc; use node::account::AccountSecretKey; use node::config::DEVNET_CONFIG; @@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize}; use crate::scenario::ListenerNode; -#[derive(Serialize, Deserialize, Debug, Clone, Default)] +#[derive(Serialize, Deserialize, Debug, Default, Clone)] pub enum TestPeerId { /// NOTE This option results a deterministic private key derived from the /// node index in the cluster. Be aware that when interacting with OCaml @@ -26,18 +26,25 @@ pub struct RustNodeTestingConfig { pub initial_time: redux::Timestamp, pub genesis: Arc, pub max_peers: usize, - pub ask_initial_peers_interval: Duration, + #[serde(default)] pub initial_peers: Vec, + #[serde(default)] pub peer_id: TestPeerId, + #[serde(default)] pub snark_worker: Option, + #[serde(default)] pub block_producer: Option, + #[serde(default)] pub timeouts: P2pTimeouts, + #[serde(default)] pub libp2p_port: Option, + #[serde(default)] pub recorder: Recorder, } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Default, Clone)] pub enum Recorder { + #[default] None, StateWithInputActions, } @@ -54,7 +61,6 @@ impl RustNodeTestingConfig { initial_time: redux::Timestamp::ZERO, genesis: DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(10), initial_peers: Vec::new(), peer_id: TestPeerId::default(), block_producer: None, @@ -70,7 +76,6 @@ impl RustNodeTestingConfig { initial_time: redux::Timestamp::ZERO, genesis: DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(10), initial_peers: Vec::new(), peer_id: TestPeerId::default(), block_producer: None, @@ -86,11 +91,6 @@ impl RustNodeTestingConfig { self } - pub fn ask_initial_peers_interval(mut self, d: Duration) -> Self { - self.ask_initial_peers_interval = d; - self - } - pub fn initial_peers(mut self, v: Vec) -> Self { self.initial_peers = v; self @@ -119,9 +119,3 @@ impl RustNodeTestingConfig { self } } - -impl Default for Recorder { - fn default() -> Self { - Self::None - } -} diff --git a/node/testing/src/scenarios/mod.rs b/node/testing/src/scenarios/mod.rs index 867a1f7464..a959c5cfda 100644 --- a/node/testing/src/scenarios/mod.rs +++ b/node/testing/src/scenarios/mod.rs @@ -168,7 +168,7 @@ impl Scenarios { async fn run(self, cluster: &mut Cluster, add_step: F) where - F: FnMut(&ScenarioStep), + F: Send + FnMut(&ScenarioStep), { let runner = ClusterRunner::new(cluster, add_step); match self { diff --git a/node/testing/src/scenarios/multi_node/basic_connectivity_initial_joining.rs b/node/testing/src/scenarios/multi_node/basic_connectivity_initial_joining.rs index 73eb32db79..9ae698eec0 100644 --- a/node/testing/src/scenarios/multi_node/basic_connectivity_initial_joining.rs +++ b/node/testing/src/scenarios/multi_node/basic_connectivity_initial_joining.rs @@ -44,8 +44,7 @@ impl MultiNodeBasicConnectivityInitialJoining { let node = runner.add_rust_node( RustNodeTestingConfig::devnet_default() .max_peers(MAX_PEERS_PER_NODE) - .initial_peers(vec![seed_node.into()]) - .ask_initial_peers_interval(Duration::from_secs(10)), + .initial_peers(vec![seed_node.into()]), ); eprintln!("launch Openmina node, id: {node}, connects to {seed_node}"); diff --git a/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs b/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs index 771b74a018..fb7936288b 100644 --- a/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs +++ b/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs @@ -67,7 +67,6 @@ impl MultiNodeBasicConnectivityPeerDiscovery { eprintln!("OCaml nodes should be ready now"); let config = RustNodeTestingConfig::devnet_default() - .ask_initial_peers_interval(Duration::from_secs(3600)) //.with_daemon_json("genesis_ledgers/devnet-full.json") .max_peers(100) .initial_peers( diff --git a/node/testing/src/scenarios/multi_node/pubsub_advanced.rs b/node/testing/src/scenarios/multi_node/pubsub_advanced.rs index 743343873e..d946326885 100644 --- a/node/testing/src/scenarios/multi_node/pubsub_advanced.rs +++ b/node/testing/src/scenarios/multi_node/pubsub_advanced.rs @@ -45,6 +45,6 @@ impl MultiNodePubsubPropagateBlock { recorder: Recorder::StateWithInputActions, }; let mut simulator = Simulator::new(initial_time, config); - simulator.run(&mut runner).await; + simulator.setup_and_run(&mut runner).await; } } diff --git a/node/testing/src/scenarios/multi_node/vrf_correct_ledgers.rs b/node/testing/src/scenarios/multi_node/vrf_correct_ledgers.rs index a9576a7ec4..07fd97d8ff 100644 --- a/node/testing/src/scenarios/multi_node/vrf_correct_ledgers.rs +++ b/node/testing/src/scenarios/multi_node/vrf_correct_ledgers.rs @@ -37,7 +37,6 @@ impl MultiNodeVrfGetCorrectLedgers { initial_time, genesis: node::config::DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(60 * 60), initial_peers: Vec::new(), peer_id: Default::default(), block_producer: Some(RustNodeBlockProducerTestingConfig { diff --git a/node/testing/src/scenarios/multi_node/vrf_correct_slots.rs b/node/testing/src/scenarios/multi_node/vrf_correct_slots.rs index d0f5b88864..97c0e0a8c7 100644 --- a/node/testing/src/scenarios/multi_node/vrf_correct_slots.rs +++ b/node/testing/src/scenarios/multi_node/vrf_correct_slots.rs @@ -43,7 +43,6 @@ impl MultiNodeVrfGetCorrectSlots { initial_time, genesis: node::config::DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(60 * 60), initial_peers: Vec::new(), peer_id: Default::default(), block_producer: Some(RustNodeBlockProducerTestingConfig { diff --git a/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs b/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs index d3d3a10be3..886ae23b27 100644 --- a/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs +++ b/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_correct_ledgers.rs @@ -51,7 +51,6 @@ impl MultiNodeVrfEpochBoundsCorrectLedger { initial_time, genesis: node::config::DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(60 * 60), initial_peers: Vec::new(), peer_id: Default::default(), block_producer: None, diff --git a/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_evaluation.rs b/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_evaluation.rs index 673d04496c..77eb09bc8f 100644 --- a/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_evaluation.rs +++ b/node/testing/src/scenarios/multi_node/vrf_epoch_bounds_evaluation.rs @@ -37,7 +37,6 @@ impl MultiNodeVrfEpochBoundsEvaluation { initial_time, genesis: node::config::DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(60 * 60), initial_peers: Vec::new(), peer_id: Default::default(), block_producer: None, diff --git a/node/testing/src/scenarios/p2p/pubsub.rs b/node/testing/src/scenarios/p2p/pubsub.rs index 1e2d1604c3..225e1d5eb5 100644 --- a/node/testing/src/scenarios/p2p/pubsub.rs +++ b/node/testing/src/scenarios/p2p/pubsub.rs @@ -14,7 +14,6 @@ impl P2pReceiveBlock { pub async fn run(self, mut runner: ClusterRunner<'_>) { let config = RustNodeTestingConfig::devnet_default() // make sure it will not ask initial peers - .ask_initial_peers_interval(Duration::from_secs(3600)) .max_peers(1) .initial_peers(vec![hosts::devnet()[0].clone()]); let retransmitter_openmina_node = runner.add_rust_node(config); @@ -27,7 +26,6 @@ impl P2pReceiveBlock { let config = RustNodeTestingConfig::devnet_default() // make sure it will not ask initial peers - .ask_initial_peers_interval(Duration::from_secs(3600)) .max_peers(1) .initial_peers(vec![retransmitter_openmina_node.into()]); let receiver_openmina_node = runner.add_rust_node(config); diff --git a/node/testing/src/scenarios/record_replay/block_production.rs b/node/testing/src/scenarios/record_replay/block_production.rs index d6f5025cfb..0b8e82f098 100644 --- a/node/testing/src/scenarios/record_replay/block_production.rs +++ b/node/testing/src/scenarios/record_replay/block_production.rs @@ -39,7 +39,7 @@ impl RecordReplayBlockProduction { recorder: Recorder::StateWithInputActions, }; let mut simulator = Simulator::new(initial_time, cfg); - simulator.run(&mut runner).await; + simulator.setup_and_run(&mut runner).await; // flush the recorded data. node::recorder::Recorder::graceful_shutdown(); diff --git a/node/testing/src/scenarios/simulation/small.rs b/node/testing/src/scenarios/simulation/small.rs index d7bbc879cd..8d77b8b655 100644 --- a/node/testing/src/scenarios/simulation/small.rs +++ b/node/testing/src/scenarios/simulation/small.rs @@ -43,6 +43,6 @@ impl SimulationSmall { recorder: Default::default(), }; let mut simulator = Simulator::new(initial_time, cfg); - simulator.run(&mut runner).await; + simulator.setup_and_run(&mut runner).await; } } diff --git a/node/testing/src/scenarios/simulation/small_forever_real_time.rs b/node/testing/src/scenarios/simulation/small_forever_real_time.rs index 8d77992a2f..1b013a5f49 100644 --- a/node/testing/src/scenarios/simulation/small_forever_real_time.rs +++ b/node/testing/src/scenarios/simulation/small_forever_real_time.rs @@ -43,6 +43,6 @@ impl SimulationSmallForeverRealTime { recorder: Default::default(), }; let mut simulator = Simulator::new(initial_time, cfg); - simulator.run(&mut runner).await; + simulator.setup_and_run(&mut runner).await; } } diff --git a/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs b/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs index 55bc34059f..626d8b4ad4 100644 --- a/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs +++ b/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs @@ -35,7 +35,6 @@ impl SoloNodeBasicConnectivityAcceptIncoming { eprintln!("add initial peer: {seed:?}"); } let config = RustNodeTestingConfig::devnet_default() - .ask_initial_peers_interval(Duration::from_secs(3600)) .max_peers(MAX_PEERS_PER_NODE) .initial_peers(initial_peers) .with_peer_id(rand::thread_rng().gen()); diff --git a/node/testing/src/scenarios/solo_node/basic_connectivity_initial_joining.rs b/node/testing/src/scenarios/solo_node/basic_connectivity_initial_joining.rs index b04cd24ac4..cac135ee3c 100644 --- a/node/testing/src/scenarios/solo_node/basic_connectivity_initial_joining.rs +++ b/node/testing/src/scenarios/solo_node/basic_connectivity_initial_joining.rs @@ -35,7 +35,6 @@ impl SoloNodeBasicConnectivityInitialJoining { eprintln!("add initial peer: {seed:?}"); } let config = RustNodeTestingConfig::devnet_default() - .ask_initial_peers_interval(Duration::from_secs(3600)) .max_peers(MAX_PEERS_PER_NODE) .initial_peers(initial_peers); diff --git a/node/testing/src/scenarios/solo_node/sync_to_genesis.rs b/node/testing/src/scenarios/solo_node/sync_to_genesis.rs index 3d6a127fa2..f5ffc5eb6a 100644 --- a/node/testing/src/scenarios/solo_node/sync_to_genesis.rs +++ b/node/testing/src/scenarios/solo_node/sync_to_genesis.rs @@ -47,7 +47,6 @@ impl SoloNodeSyncToGenesis { initial_time, genesis: node::config::DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(60 * 60), initial_peers: Vec::new(), peer_id: Default::default(), snark_worker: None, diff --git a/node/testing/src/scenarios/solo_node/sync_to_genesis_custom.rs b/node/testing/src/scenarios/solo_node/sync_to_genesis_custom.rs index 9fb673774f..6e795b221f 100644 --- a/node/testing/src/scenarios/solo_node/sync_to_genesis_custom.rs +++ b/node/testing/src/scenarios/solo_node/sync_to_genesis_custom.rs @@ -63,7 +63,6 @@ impl SoloNodeSyncToGenesisCustom { initial_time, genesis: node::config::DEVNET_CONFIG.clone(), max_peers: 100, - ask_initial_peers_interval: Duration::from_secs(60 * 60), initial_peers: Vec::new(), peer_id: Default::default(), block_producer: None, diff --git a/node/testing/src/server/mod.rs b/node/testing/src/server/mod.rs index dc6028ec24..e080c5b881 100644 --- a/node/testing/src/server/mod.rs +++ b/node/testing/src/server/mod.rs @@ -1,3 +1,5 @@ +pub mod simulator; + use crate::cluster::{Cluster, ClusterConfig, ClusterNodeId}; use crate::node::NodeTestingConfig; use crate::scenario::{event_details, Scenario, ScenarioId, ScenarioInfo, ScenarioStep}; @@ -11,6 +13,8 @@ use axum::{ routing::{get, post, put}, Json, Router, }; +use node::p2p::connection::outgoing::P2pConnectionOutgoingInitOpts; +use node::transition_frontier::genesis::{GenesisConfig, PrebuiltGenesisConfig}; use rand::{rngs::StdRng, Rng, SeedableRng}; use serde::{Deserialize, Serialize}; use tokio::net::TcpListener; @@ -40,6 +44,8 @@ pub fn server(rt: Runtime, port: u16) { "/:cluster_id/scenarios/reload", post(cluster_scenarios_reload), ) + .route("/:cluster_id/seeds", get(cluster_seeds)) + .route("/:cluster_id/genesis/config", get(cluster_genesis_config)) .route( "/:cluster_id/nodes/events/pending", get(cluster_events_pending), @@ -55,6 +61,7 @@ pub fn server(rt: Runtime, port: u16) { let app = Router::new() .nest("/scenarios", scenarios_router) .nest("/clusters", clusters_router) + .nest("/simulations", simulator::simulations_router()) .with_state(state) .layer(cors); @@ -143,6 +150,27 @@ impl AppState { Ok((id, cluster_guard)) } + pub async fn cluster_create_empty( + &self, + config: ClusterConfig, + ) -> Result<(u16, OwnedMutexGuard), (StatusCode, String)> { + let cluster = Cluster::new(config); + + let mut state = self.lock().await; + let id = loop { + let id = state.rng.gen(); + if !state.clusters.contains_key(&id) { + break id; + } + }; + + let cluster = Arc::new(Mutex::new(cluster)); + let cluster_guard = cluster.clone().try_lock_owned().unwrap(); + state.clusters.insert(id, cluster); + + Ok((id, cluster_guard)) + } + pub async fn cluster_destroy(&self, cluster_id: u16) -> bool { self.lock().await.clusters.remove(&cluster_id).is_some() } @@ -380,6 +408,69 @@ async fn cluster_scenarios_reload( .map_err(|err| (StatusCode::INTERNAL_SERVER_ERROR, err.to_string())) } +async fn cluster_seeds( + State(state): State, + Path(cluster_id): Path, +) -> Result>, (StatusCode, String)> { + state + .cluster(cluster_id) + .await + .map(|cluster| { + cluster + .nodes_iter() + .filter(|(_, node)| node.config().initial_peers.is_empty()) + .map(|(_, node)| node.dial_addr()) + .collect() + }) + .map(Json) +} + +async fn cluster_genesis_config( + State(state): State, + Path(cluster_id): Path, +) -> Result, (StatusCode, String)> { + let cluster = state.cluster(cluster_id).await?; + let genesis = cluster + .nodes_iter() + .next() + .map(|(_, node)| node.config().genesis.clone()); + let genesis = genesis.ok_or_else(|| { + ( + StatusCode::BAD_REQUEST, + "no nodes in the cluster".to_owned(), + ) + })?; + if let GenesisConfig::Prebuilt(encoded) = &*genesis { + return Ok(encoded.clone().into_owned()); + } + tokio::task::spawn_blocking(move || { + let res = genesis.load().map_err(|err| { + ( + StatusCode::INTERNAL_SERVER_ERROR, + format!("failed to load genesis config. err: {err}"), + ) + })?; + let mut encoded = Vec::new(); + PrebuiltGenesisConfig::from_loaded(res) + .map_err(|_| { + ( + StatusCode::INTERNAL_SERVER_ERROR, + "failed to build `PrebuiltGenesisConfig` from loaded data".to_owned(), + ) + })? + .store(&mut encoded) + .map_err(|_| { + ( + StatusCode::INTERNAL_SERVER_ERROR, + "failed to encode `PrebuiltGenesisConfig`".to_owned(), + ) + })?; + Ok(encoded) + }) + .await + .map_err(|_| (StatusCode::INTERNAL_SERVER_ERROR, "join error".to_owned()))? +} + #[derive(Serialize)] struct ClusterNodePendingEvents { node_id: ClusterNodeId, diff --git a/node/testing/src/server/simulator.rs b/node/testing/src/server/simulator.rs new file mode 100644 index 0000000000..a4669979f0 --- /dev/null +++ b/node/testing/src/server/simulator.rs @@ -0,0 +1,87 @@ +use std::{sync::Arc, time::Duration}; + +use axum::{ + extract::{Json, State}, + http::StatusCode, + routing::put, +}; +use openmina_core::channels::oneshot; +use serde::{Deserialize, Serialize}; + +use crate::{ + cluster::ClusterConfig, + scenarios::ClusterRunner, + simulator::{Simulator, SimulatorConfig}, +}; + +use super::AppState; + +pub fn simulations_router() -> axum::Router { + axum::Router::new().route("/", put(simulation_create)) +} + +#[derive(Deserialize)] +struct SimulationCreateArgs { + cluster: ClusterConfig, + simulator: SimulatorConfig, +} + +#[derive(Serialize)] +struct SimulationCreateResponse { + cluster_id: u16, +} + +async fn simulation_create( + State(state): State, + Json(args): Json, +) -> Result, (StatusCode, String)> { + async fn setup( + state: AppState, + args: SimulationCreateArgs, + ) -> Result<(u16, Simulator), (StatusCode, String)> { + let (cluster_id, mut cluster) = state.cluster_create_empty(args.cluster).await?; + + let initial_time = redux::Timestamp::global_now(); + let mut simulator = Simulator::new(initial_time, args.simulator); + simulator + .setup(&mut ClusterRunner::new(&mut cluster, |_| {})) + .await; + Ok((cluster_id, simulator)) + } + let (setup_tx, setup_rx) = oneshot::channel(); + let state_clone = state.clone(); + + std::thread::spawn(move || { + let state = state_clone; + let rt = tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .unwrap(); + rt.block_on(async move { + let (cluster_id, mut simulator) = match setup(state.clone(), args).await { + Err(err) => { + let _ = setup_tx.send(Err(err)); + return; + } + Ok((cluster_id, simulator)) => { + let _ = setup_tx.send(Ok(cluster_id)); + (cluster_id, simulator) + } + }; + let cluster_mutex = match state.cluster_mutex(cluster_id).await { + Err(_) => return, + Ok(cluster_mutex) => Arc::downgrade(&cluster_mutex), + }; + while let Some(cluster_mutex) = cluster_mutex.upgrade() { + let mut cluster = cluster_mutex.lock().await; + let mut runner = ClusterRunner::new(&mut *cluster, |_| {}); + let _ = + tokio::time::timeout(Duration::from_millis(500), simulator.run(&mut runner)) + .await; + } + }); + }); + let cluster_id = setup_rx.await.unwrap()?; + + Ok(SimulationCreateResponse { cluster_id }).map(Json) +} diff --git a/node/testing/src/simulator/config.rs b/node/testing/src/simulator/config.rs index a8b5c2d730..11913b1c90 100644 --- a/node/testing/src/simulator/config.rs +++ b/node/testing/src/simulator/config.rs @@ -12,15 +12,24 @@ pub struct SimulatorConfig { pub normal_nodes: usize, pub snark_workers: usize, pub block_producers: usize, + #[serde(default)] pub advance_time: RunCfgAdvanceTime, + #[serde(default)] pub run_until: SimulatorRunUntil, + #[serde(default = "duration_max")] pub run_until_timeout: Duration, + #[serde(default)] pub recorder: Recorder, } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Default, Clone)] pub enum SimulatorRunUntil { + #[default] Forever, Epoch(u32), BlockchainLength(u32), } + +fn duration_max() -> Duration { + Duration::MAX +} diff --git a/node/testing/src/simulator/mod.rs b/node/testing/src/simulator/mod.rs index a5e4a2b85e..89a9e29dc4 100644 --- a/node/testing/src/simulator/mod.rs +++ b/node/testing/src/simulator/mod.rs @@ -1,5 +1,6 @@ mod config; pub use config::*; + use mina_p2p_messages::v2::{ CurrencyFeeStableV1, UnsignedExtendedUInt64Int64ForVersionTagsStableV1, }; @@ -37,7 +38,6 @@ impl Simulator { initial_time: self.initial_time(), genesis: self.config.genesis.clone(), max_peers: 1000, - ask_initial_peers_interval: Duration::from_secs(60), initial_peers: Vec::new(), peer_id: Default::default(), block_producer: None, @@ -98,6 +98,10 @@ impl Simulator { } async fn set_up_normal_nodes(&mut self, runner: &mut ClusterRunner<'_>) { + if self.config.normal_nodes == 0 { + return; + } + eprintln!("setting up normal nodes: {}", self.config.normal_nodes); let node_config = RustNodeTestingConfig { @@ -114,6 +118,10 @@ impl Simulator { } async fn set_up_snark_worker_nodes(&mut self, runner: &mut ClusterRunner<'_>) { + if self.config.snark_workers == 0 { + return; + } + eprintln!( "setting up rust snark worker nodes: {}", self.config.snark_workers @@ -163,6 +171,10 @@ impl Simulator { } async fn set_up_block_producer_nodes(&mut self, runner: &mut ClusterRunner<'_>) { + if self.config.block_producers == 0 { + return; + } + let block_producers = runner.block_producer_sec_keys(ClusterNodeId::new_unchecked(0)); assert!(self.config.block_producers <= block_producers.len()); @@ -203,12 +215,19 @@ impl Simulator { self.wait_for_all_nodes_synced(runner).await; } - pub async fn run<'a>(&mut self, runner: &mut ClusterRunner<'a>) { + pub async fn setup<'a>(&mut self, runner: &mut ClusterRunner<'a>) { self.set_up_seed_nodes(runner).await; self.set_up_normal_nodes(runner).await; self.set_up_snark_worker_nodes(runner).await; self.set_up_block_producer_nodes(runner).await; + } + pub async fn setup_and_run<'a>(&mut self, runner: &mut ClusterRunner<'a>) { + self.setup(runner).await; + self.run(runner).await; + } + + pub async fn run<'a>(&mut self, runner: &mut ClusterRunner<'a>) { let run_until = self.config.run_until.clone(); let advance_time = self.config.advance_time.clone(); let start_t = redux::Instant::now(); diff --git a/node/web/src/node/builder.rs b/node/web/src/node/builder.rs index c9270a7a45..5942877f60 100644 --- a/node/web/src/node/builder.rs +++ b/node/web/src/node/builder.rs @@ -231,7 +231,6 @@ impl NodeBuilder { identity_pub_key: p2p_sec_key.public_key(), initial_peers, external_addrs: vec![], - ask_initial_peers_interval: Duration::from_secs(3600), enabled_channels: ChannelId::iter_all().collect(), peer_discovery: !self.p2p_no_discovery, meshsub: P2pMeshsubConfig { diff --git a/p2p/src/p2p_config.rs b/p2p/src/p2p_config.rs index 9a425a8b7e..dc0be207f8 100644 --- a/p2p/src/p2p_config.rs +++ b/p2p/src/p2p_config.rs @@ -25,10 +25,6 @@ pub struct P2pConfig { /// External addresses pub external_addrs: Vec, - /// The time interval that must elapse before the next peer discovery request. - /// The node periodically polls peers for their connections to keep our list up to date. - pub ask_initial_peers_interval: Duration, - pub enabled_channels: BTreeSet, pub timeouts: P2pTimeouts, diff --git a/p2p/testing/src/cluster.rs b/p2p/testing/src/cluster.rs index 671f55887e..454e95f318 100644 --- a/p2p/testing/src/cluster.rs +++ b/p2p/testing/src/cluster.rs @@ -355,7 +355,6 @@ impl Cluster { identity_pub_key: secret_key.public_key(), initial_peers, external_addrs: vec![], - ask_initial_peers_interval: Duration::from_secs(5), enabled_channels: p2p::channels::ChannelId::for_libp2p().collect(), peer_discovery: config.discovery, timeouts: config.timeouts, From 67ba3d483a89eed4220a1ba38faa8d29c2ceff1b Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Fri, 8 Nov 2024 01:29:00 +0400 Subject: [PATCH 057/175] feat(testing/server): expose webnode re: #867 --- Cargo.lock | 17 +++++++++++++++++ node/testing/Cargo.toml | 2 +- node/testing/src/server/mod.rs | 25 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 7140b81fa6..7d111810ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2657,6 +2657,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" + [[package]] name = "httparse" version = "1.8.0" @@ -7373,10 +7379,21 @@ checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" dependencies = [ "bitflags 2.4.1", "bytes", + "futures-util", "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "http-range-header", + "httpdate", + "mime", + "mime_guess", + "percent-encoding", "pin-project-lite", + "tokio", + "tokio-util", "tower-layer", "tower-service", + "tracing", ] [[package]] diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml index 586281d45f..ee0f78b31f 100644 --- a/node/testing/Cargo.toml +++ b/node/testing/Cargo.toml @@ -25,7 +25,7 @@ tokio = { version = "1.26.0" } num_cpus = "1.0" rayon = "1.5" axum = "0.7" -tower-http = { version = "0.6", features = ["cors"] } +tower-http = { version = "0.6", features = ["cors", "fs"] } strum = "0.26" strum_macros = "0.26" tracing-log = "0.2.0" diff --git a/node/testing/src/server/mod.rs b/node/testing/src/server/mod.rs index e080c5b881..66dd715e7d 100644 --- a/node/testing/src/server/mod.rs +++ b/node/testing/src/server/mod.rs @@ -5,8 +5,12 @@ use crate::node::NodeTestingConfig; use crate::scenario::{event_details, Scenario, ScenarioId, ScenarioInfo, ScenarioStep}; use crate::service::PendingEventId; +use std::path::PathBuf; use std::{collections::BTreeMap, sync::Arc, time::Duration}; +use axum::http::header; +use axum::middleware; +use axum::routing::get_service; use axum::{ extract::{Path, State}, http::StatusCode, @@ -21,9 +25,14 @@ use tokio::net::TcpListener; use tokio::runtime::Runtime; use tokio::sync::{oneshot, Mutex, MutexGuard, OwnedMutexGuard}; use tower_http::cors::CorsLayer; +use tower_http::services::ServeDir; pub fn server(rt: Runtime, port: u16) { + let fe_dist_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")) + .join("../../") + .join("frontend/dist/frontend/"); eprintln!("scenarios path: {}", Scenario::PATH); + eprintln!("FrontEnd dist path: {fe_dist_dir:?}"); let state = AppState::new(); @@ -62,6 +71,22 @@ pub fn server(rt: Runtime, port: u16) { .nest("/scenarios", scenarios_router) .nest("/clusters", clusters_router) .nest("/simulations", simulator::simulations_router()) + .fallback( + get_service(ServeDir::new(fe_dist_dir)).layer(middleware::from_fn( + |req, next: middleware::Next| async { + let mut resp = next.run(req).await; + resp.headers_mut().insert( + header::HeaderName::from_static("cross-origin-embedder-policy"), + header::HeaderValue::from_static("require-corp"), + ); + resp.headers_mut().insert( + header::HeaderName::from_static("cross-origin-opener-policy"), + header::HeaderValue::from_static("same-origin"), + ); + resp + }, + )), + ) .with_state(state) .layer(cors); From dd746269ece80cd55a3d0e6b65bc2da7f9951307 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Mon, 11 Nov 2024 08:44:45 +0400 Subject: [PATCH 058/175] fix(p2p/webrtc): connection closed by peer, not pruned --- node/src/action_kind.rs | 4 +- node/src/event_source/event_source_effects.rs | 2 +- .../p2p_disconnection_actions.rs | 4 ++ .../p2p_disconnection_reducer.rs | 41 +++++++------------ 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index ca8823d8c8..d5dc25d10d 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -358,6 +358,7 @@ pub enum ActionKind { P2pConnectionOutgoingEffectfulRandomInit, P2pDisconnectionFinish, P2pDisconnectionInit, + P2pDisconnectionPeerClosed, P2pDisconnectionEffectfulInit, P2pEffectfulInitialize, P2pIdentifyNewRequest, @@ -704,7 +705,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 589; + pub const COUNT: u16 = 590; } impl std::fmt::Display for ActionKind { @@ -1184,6 +1185,7 @@ impl ActionKindGet for P2pDisconnectionAction { fn kind(&self) -> ActionKind { match self { Self::Init { .. } => ActionKind::P2pDisconnectionInit, + Self::PeerClosed { .. } => ActionKind::P2pDisconnectionPeerClosed, Self::Finish { .. } => ActionKind::P2pDisconnectionFinish, } } diff --git a/node/src/event_source/event_source_effects.rs b/node/src/event_source/event_source_effects.rs index de299f9c0e..339ba4e81e 100644 --- a/node/src/event_source/event_source_effects.rs +++ b/node/src/event_source/event_source_effects.rs @@ -197,7 +197,7 @@ pub fn event_source_effects(store: &mut Store, action: EventSourc } }, P2pConnectionEvent::Closed(peer_id) => { - store.dispatch(P2pDisconnectionAction::Finish { peer_id }); + store.dispatch(P2pDisconnectionAction::PeerClosed { peer_id }); } }, P2pEvent::Channel(e) => match e { diff --git a/p2p/src/disconnection/p2p_disconnection_actions.rs b/p2p/src/disconnection/p2p_disconnection_actions.rs index 6a9b011e8d..19874939e3 100644 --- a/p2p/src/disconnection/p2p_disconnection_actions.rs +++ b/p2p/src/disconnection/p2p_disconnection_actions.rs @@ -15,6 +15,9 @@ pub enum P2pDisconnectionAction { peer_id: PeerId, reason: P2pDisconnectionReason, }, + /// Peer disconnection. + #[action_event(fields(display(peer_id)), level = info)] + PeerClosed { peer_id: PeerId }, /// Finish disconnecting from a peer. #[action_event(fields(display(peer_id)), level = debug)] Finish { peer_id: PeerId }, @@ -24,6 +27,7 @@ impl redux::EnablingCondition for P2pDisconnectionAction { fn is_enabled(&self, state: &P2pState, _time: redux::Timestamp) -> bool { match self { P2pDisconnectionAction::Init { peer_id, .. } + | P2pDisconnectionAction::PeerClosed { peer_id, .. } | P2pDisconnectionAction::Finish { peer_id } => { state.peers.get(peer_id).map_or(false, |peer| { !matches!(peer.status, P2pPeerStatus::Disconnected { .. }) diff --git a/p2p/src/disconnection/p2p_disconnection_reducer.rs b/p2p/src/disconnection/p2p_disconnection_reducer.rs index 761205ddbc..aa43664c27 100644 --- a/p2p/src/disconnection/p2p_disconnection_reducer.rs +++ b/p2p/src/disconnection/p2p_disconnection_reducer.rs @@ -55,41 +55,29 @@ impl P2pDisconnectedState { dispatcher.push(P2pDisconnectionEffectfulAction::Init { peer_id }); Ok(()) } - #[cfg(not(feature = "p2p-libp2p"))] + P2pDisconnectionAction::PeerClosed { peer_id } => { + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(P2pDisconnectionEffectfulAction::Init { peer_id }); + Ok(()) + } P2pDisconnectionAction::Finish { peer_id } => { let Some(peer) = p2p_state.peers.get_mut(&peer_id) else { bug_condition!("Invalid state for: `P2pDisconnectionAction::Finish`"); return Ok(()); }; - peer.status = P2pPeerStatus::Disconnected { time: meta.time() }; - - let (dispatcher, state) = state_context.into_dispatcher_and_state(); - let p2p_state: &P2pState = state.substate()?; - dispatcher.push(P2pPeerAction::Remove { peer_id }); - - if let Some(callback) = &p2p_state.callbacks.on_p2p_disconnection_finish { - dispatcher.push_callback(callback.clone(), peer_id); - } - Ok(()) - } - #[cfg(feature = "p2p-libp2p")] - P2pDisconnectionAction::Finish { peer_id } => { - if p2p_state - .network - .scheduler - .connections - .iter() - .any(|(_addr, conn_state)| { - conn_state.peer_id() == Some(&peer_id) && conn_state.closed.is_none() - }) + if peer.is_libp2p() + && p2p_state + .network + .scheduler + .connections + .iter() + .any(|(_addr, conn_state)| { + conn_state.peer_id() == Some(&peer_id) && conn_state.closed.is_none() + }) { return Ok(()); } - let Some(peer) = p2p_state.peers.get_mut(&peer_id) else { - bug_condition!("Invalid state for: `P2pDisconnectionAction::Finish`"); - return Ok(()); - }; peer.status = P2pPeerStatus::Disconnected { time: meta.time() }; let (dispatcher, state) = state_context.into_dispatcher_and_state(); @@ -99,7 +87,6 @@ impl P2pDisconnectedState { if let Some(callback) = &p2p_state.callbacks.on_p2p_disconnection_finish { dispatcher.push_callback(callback.clone(), peer_id); } - Ok(()) } } From 6178668027c0a920a286ef51bb59b04152f8504a Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Tue, 12 Nov 2024 07:50:07 +0400 Subject: [PATCH 059/175] feat(testing/server): custom cluster webnode full integration re: #867 --- Cargo.lock | 5 +- core/Cargo.toml | 2 + core/src/http.rs | 49 +++++ core/src/lib.rs | 4 + frontend/src/app/app.component.ts | 5 + .../src/app/core/services/web-node.service.ts | 41 ++++- ledger/Cargo.toml | 2 - ledger/src/proofs/circuit_blobs.rs | 51 +----- node/account/src/secret_key.rs | 4 + .../transition_frontier_genesis_config.rs | 11 ++ node/testing/Cargo.toml | 4 +- node/testing/src/cluster/mod.rs | 13 +- node/testing/src/main.rs | 10 +- node/testing/src/server/mod.rs | 168 +++++++++++++----- node/testing/src/server/simulator.rs | 12 +- node/testing/src/server/webnode.rs | 74 ++++++++ node/testing/src/simulator/mod.rs | 4 +- node/web/src/lib.rs | 33 +++- .../p2p_connection_incoming_actions.rs | 1 + p2p/src/connection/outgoing/mod.rs | 11 ++ ...p_connection_outgoing_effectful_effects.rs | 4 +- p2p/src/service_impl/webrtc/mod.rs | 19 +- p2p/src/webrtc/signaling_method/mod.rs | 38 +++- 23 files changed, 439 insertions(+), 126 deletions(-) create mode 100644 core/src/http.rs create mode 100644 node/testing/src/server/webnode.rs diff --git a/Cargo.lock b/Cargo.lock index 7d111810ec..c5dfd00aea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3855,7 +3855,6 @@ dependencies = [ "getrandom", "hex", "itertools 0.10.5", - "js-sys", "juniper", "kimchi", "lazy_static", @@ -4570,6 +4569,7 @@ dependencies = [ "bs58 0.4.0", "crypto_secretbox", "hex", + "js-sys", "lazy_static", "md5", "mina-hasher", @@ -4590,6 +4590,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "wasm_thread", + "web-sys", ] [[package]] @@ -4736,6 +4737,8 @@ version = "0.11.0" dependencies = [ "anyhow", "axum", + "base64 0.22.0", + "bs58 0.4.0", "clap 4.5.20", "console", "ctrlc", diff --git a/core/Cargo.toml b/core/Cargo.toml index 6cc227e4c4..b9b88d7e71 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -39,6 +39,8 @@ redux = { workspace = true, features=["serializable_callbacks"] } wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" wasm_thread = { version = "0.3", features = [ "es_modules" ] } +js-sys = "0.3" +web-sys = { version = "0.3", features = ["Window", "Response"] } [dev-dependencies] serde_json = { version = "1" } diff --git a/core/src/http.rs b/core/src/http.rs new file mode 100644 index 0000000000..830776cfb4 --- /dev/null +++ b/core/src/http.rs @@ -0,0 +1,49 @@ +#[cfg(target_family = "wasm")] +mod http { + use crate::thread; + use wasm_bindgen::prelude::*; + + fn to_io_err(err: JsValue) -> std::io::Error { + std::io::Error::new(std::io::ErrorKind::Other, format!("{err:?}")) + } + + async fn _get_bytes(url: String) -> std::io::Result> { + use wasm_bindgen_futures::JsFuture; + use web_sys::Response; + + // let window = js_sys::global().dyn_into::().unwrap(); + let window = web_sys::window().unwrap(); + + let resp_value = JsFuture::from(window.fetch_with_str(&url)) + .await + .map_err(to_io_err)?; + + assert!(resp_value.is_instance_of::()); + let resp: Response = resp_value.dyn_into().unwrap(); + let js = JsFuture::from(resp.array_buffer().map_err(to_io_err)?) + .await + .map_err(to_io_err)?; + Ok(js_sys::Uint8Array::new(&js).to_vec()) + } + + pub async fn get_bytes(url: &str) -> std::io::Result> { + let url = url.to_owned(); + if thread::is_web_worker_thread() { + thread::run_async_fn_in_main_thread(move || _get_bytes(url)).await.expect("failed to run task in the main thread! Maybe main thread crashed or not initialized?") + } else { + _get_bytes(url).await + } + } + + pub fn get_bytes_blocking(url: &str) -> std::io::Result> { + let url = url.to_owned(); + if thread::is_web_worker_thread() { + thread::run_async_fn_in_main_thread_blocking(move || _get_bytes(url)).expect("failed to run task in the main thread! Maybe main thread crashed or not initialized?") + } else { + panic!("can't do blocking requests from main browser thread"); + } + } +} + +#[cfg(target_family = "wasm")] +pub use http::{get_bytes, get_bytes_blocking}; diff --git a/core/src/lib.rs b/core/src/lib.rs index ad9bfe68fa..b426daf5bd 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -2,6 +2,10 @@ pub mod invariants; pub mod log; pub mod requests; +// TODO(binier): refactor +#[cfg(target_family = "wasm")] +pub mod http; + pub mod channels; pub mod thread; diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 6eaed1eeb9..8fd2baaa6e 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -42,6 +42,11 @@ export class AppComponent extends StoreDispatcher implements OnInit { } ngOnInit(): void { + const args = new URLSearchParams(window.location.search).get("a"); + if (!!args) { + window.localStorage.setItem("webnodeArgs", args); + } + this.select( getMergedRoute, () => this.initAppFunctionalities(), diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index 9dc17a8cb8..c072096286 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -15,6 +15,7 @@ export class WebNodeService { private readonly webnode$: BehaviorSubject = new BehaviorSubject(null); private webNodeKeyPair: { publicKey: string, privateKey: string }; + private webNodeNetwork: String; private webNodeStartTime: number; private sentryEvents: any = {}; @@ -46,14 +47,36 @@ export class WebNodeService { loadWasm$(): Observable { this.webNodeStartTime = Date.now(); + const args = (() => { + const raw = window.localStorage.getItem("webnodeArgs"); + if (raw == null) { + return null; + } + return JSON.parse(atob(raw)); + })(); if (isBrowser()) { return merge( of(any(window).webnode).pipe(filter(Boolean)), fromEvent(window, 'webNodeLoaded'), ).pipe( - switchMap(() => this.http.get<{ publicKey: string, privateKey: string }>('assets/webnode/web-node-secrets.json')), + switchMap(() => { + const DEFAULT_NETWORK = "devnet"; + if (!args) { + return this.http.get<{ publicKey: string, privateKey: string }>('assets/webnode/web-node-secrets.json') + .pipe(map(blockProducer => ({blockProducer, network: DEFAULT_NETWORK}))); + } + const data = { network: args["network"] || DEFAULT_NETWORK, blockProducer: {} as any }; + if (!!args["block_producer"]) { + data["blockProducer"] = { + privateKey: args["block_producer"].sec_key, + publicKey: args["block_producer"].pub_key, + }; + } + return of(data); + }), tap(data => { - this.webNodeKeyPair = data; + this.webNodeKeyPair = data.blockProducer; + this.webNodeNetwork = data.network; }), map(() => void 0), ); @@ -68,7 +91,19 @@ export class WebNodeService { switchMap((wasm: any) => from(wasm.default(undefined, new WebAssembly.Memory(this.memory))).pipe(map(() => wasm))), switchMap((wasm) => { this.webnodeProgress$.next('Loaded'); - return from(wasm.run(this.webNodeKeyPair.privateKey)); + const urls = (() => { + if (typeof this.webNodeNetwork == 'number') { + const url = `${window.location.origin}/clusters/${this.webNodeNetwork}/`; + return { + seeds: url + 'seeds', + genesisConfig: url + 'genesis/config' + } + } else { + return {}; + } + })(); + console.log("webnode config:", !!this.webNodeKeyPair.privateKey, this.webNodeNetwork, urls); + return from(wasm.run(this.webNodeKeyPair.privateKey, urls.seeds, urls.genesisConfig)); }), tap((webnode: any) => { any(window)['webnode'] = webnode; diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 98d1468f79..7c5c174d0c 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -77,8 +77,6 @@ fraction = { version = "=0.15.1", default-features = false, features = ["with-se getrandom = { version = "0.2", features = ["js"] } wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" -js-sys = "0.3" -web-sys = { version = "0.3", features = ["Window", "Response"] } [target.'cfg(not(target_family = "wasm"))'.dependencies] zstd = { version = "0.12", optional = true } diff --git a/ledger/src/proofs/circuit_blobs.rs b/ledger/src/proofs/circuit_blobs.rs index af19c7dc2a..18558061ef 100644 --- a/ledger/src/proofs/circuit_blobs.rs +++ b/ledger/src/proofs/circuit_blobs.rs @@ -1,52 +1,5 @@ use std::path::Path; -#[cfg(target_family = "wasm")] -mod http { - use openmina_core::thread; - use wasm_bindgen::prelude::*; - - fn to_io_err(err: JsValue) -> std::io::Error { - std::io::Error::new(std::io::ErrorKind::Other, format!("{err:?}")) - } - - async fn _get_bytes(url: String) -> std::io::Result> { - use wasm_bindgen_futures::JsFuture; - use web_sys::Response; - - // let window = js_sys::global().dyn_into::().unwrap(); - let window = web_sys::window().unwrap(); - - let resp_value = JsFuture::from(window.fetch_with_str(&url)) - .await - .map_err(to_io_err)?; - - assert!(resp_value.is_instance_of::()); - let resp: Response = resp_value.dyn_into().unwrap(); - let js = JsFuture::from(resp.array_buffer().map_err(to_io_err)?) - .await - .map_err(to_io_err)?; - Ok(js_sys::Uint8Array::new(&js).to_vec()) - } - - pub async fn get_bytes(url: &str) -> std::io::Result> { - let url = url.to_owned(); - if thread::is_web_worker_thread() { - thread::run_async_fn_in_main_thread(move || _get_bytes(url)).await.expect("failed to run task in the main thread! Maybe main thread crashed or not initialized?") - } else { - _get_bytes(url).await - } - } - - pub fn get_bytes_blocking(url: &str) -> std::io::Result> { - let url = url.to_owned(); - if thread::is_web_worker_thread() { - thread::run_async_fn_in_main_thread_blocking(move || _get_bytes(url)).expect("failed to run task in the main thread! Maybe main thread crashed or not initialized?") - } else { - panic!("can't do blocking requests from main browser thread"); - } - } -} - #[cfg(not(target_family = "wasm"))] pub fn home_base_dir() -> Option { let mut path = std::path::PathBuf::from(std::env::var("HOME").ok()?); @@ -130,7 +83,7 @@ pub async fn fetch(filename: &impl AsRef) -> std::io::Result> { let prefix = option_env!("CIRCUIT_BLOBS_HTTP_PREFIX").unwrap_or("/assets/webnode/circuit-blobs"); let url = format!("{prefix}/{}", filename.as_ref().to_str().unwrap()); - http::get_bytes(&url).await + openmina_core::http::get_bytes(&url).await // http::get_bytes(&git_release_url(filename)).await } @@ -139,5 +92,5 @@ pub fn fetch_blocking(filename: &impl AsRef) -> std::io::Result> { let prefix = option_env!("CIRCUIT_BLOBS_HTTP_PREFIX").unwrap_or("/assets/webnode/circuit-blobs"); let url = format!("{prefix}/{}", filename.as_ref().to_str().unwrap()); - http::get_bytes_blocking(&url) + openmina_core::http::get_bytes_blocking(&url) } diff --git a/node/account/src/secret_key.rs b/node/account/src/secret_key.rs index 40912149fd..bdc0ec941e 100644 --- a/node/account/src/secret_key.rs +++ b/node/account/src/secret_key.rs @@ -40,6 +40,10 @@ impl AccountSecretKey { GENERATED_DETERMINISTIC[i as usize].clone() } + pub fn deterministic_iter() -> impl Iterator { + GENERATED_DETERMINISTIC.iter() + } + pub fn max_deterministic_count() -> usize { GENERATED_DETERMINISTIC.len() } diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs index 911c138539..6ae8c089d6 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs @@ -139,6 +139,17 @@ impl GenesisConfig { } } + pub fn override_genesis_state_timestamp(&mut self, timestamp: v2::BlockTimeTimeStableV1) { + match self { + Self::Counts { constants, .. } + | Self::BalancesDelegateTable { constants, .. } + | Self::AccountsBinProt { constants, .. } => { + constants.genesis_state_timestamp = timestamp; + } + _ => todo!(), + } + } + pub fn load( &self, ) -> anyhow::Result<(Vec, GenesisConfigLoaded), GenesisConfigError> { diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml index ee0f78b31f..8f24a5be9a 100644 --- a/node/testing/Cargo.toml +++ b/node/testing/Cargo.toml @@ -39,6 +39,9 @@ vrf = { workspace = true } time = { version = "0.3", features = ["formatting"] } tracing = { version = "0.1", features = ["std"] } multihash = "0.18.1" +hex = "0.4.3" +bs58 = { version = "0.4" } +base64 = "0.22" nix = { version = "0.27.1", features = ["process", "signal"] } ctrlc = "3.4.2" @@ -51,7 +54,6 @@ openmina-core = { path = "../../core" } node = { path = "../../node" } openmina-node-invariants = { path = "../../node/invariants" } openmina-node-native = { path = "../../node/native" } -hex = "0.4.3" [target.'cfg(not(target_family = "wasm"))'.dependencies] redux = { workspace = true, features=["serializable_callbacks"] } diff --git a/node/testing/src/cluster/mod.rs b/node/testing/src/cluster/mod.rs index 0163b855c1..6cf7084b6d 100644 --- a/node/testing/src/cluster/mod.rs +++ b/node/testing/src/cluster/mod.rs @@ -117,13 +117,6 @@ lazy_static::lazy_static! { static ref VERIFIER_SRS: Arc = get_srs(); } -lazy_static::lazy_static! { - static ref DETERMINISTIC_ACCOUNT_SEC_KEYS: BTreeMap = (0..1000) - .map(AccountSecretKey::deterministic) - .map(|sec_key| (sec_key.public_key(), sec_key)) - .collect(); -} - pub struct Cluster { pub config: ClusterConfig, scenario: ClusterScenarioRun, @@ -193,9 +186,9 @@ impl Cluster { } pub fn get_account_sec_key(&self, pub_key: &AccountPublicKey) -> Option<&AccountSecretKey> { - self.account_sec_keys - .get(pub_key) - .or_else(|| DETERMINISTIC_ACCOUNT_SEC_KEYS.get(pub_key)) + self.account_sec_keys.get(pub_key).or_else(|| { + AccountSecretKey::deterministic_iter().find(|sec_key| &sec_key.public_key() == pub_key) + }) } pub fn set_initial_time(&mut self, initial_time: redux::Timestamp) { diff --git a/node/testing/src/main.rs b/node/testing/src/main.rs index 53b0c694ca..0398fe2dec 100644 --- a/node/testing/src/main.rs +++ b/node/testing/src/main.rs @@ -1,5 +1,6 @@ use clap::Parser; +use node::p2p::webrtc::Host; use openmina_node_testing::cluster::{Cluster, ClusterConfig}; use openmina_node_testing::scenario::Scenario; use openmina_node_testing::scenarios::Scenarios; @@ -24,8 +25,13 @@ pub enum Command { #[derive(Debug, clap::Args)] pub struct CommandServer { - #[arg(long, short, env, default_value = "11000")] + #[arg(long, short, default_value = "127.0.0.1")] + pub host: Host, + + #[arg(long, short, default_value = "11000")] pub port: u16, + #[arg(long, short)] + pub ssl_port: Option, } #[derive(Debug, clap::Args)] @@ -66,7 +72,7 @@ impl Command { match self { Self::Server(args) => { - server(rt, args.port); + server(rt, args.host, args.port, args.ssl_port); Ok(()) } Self::ScenariosGenerate(cmd) => { diff --git a/node/testing/src/server/mod.rs b/node/testing/src/server/mod.rs index 66dd715e7d..102c68e36d 100644 --- a/node/testing/src/server/mod.rs +++ b/node/testing/src/server/mod.rs @@ -1,10 +1,12 @@ pub mod simulator; +pub mod webnode; use crate::cluster::{Cluster, ClusterConfig, ClusterNodeId}; use crate::node::NodeTestingConfig; use crate::scenario::{event_details, Scenario, ScenarioId, ScenarioInfo, ScenarioStep}; use crate::service::PendingEventId; +use std::collections::BTreeSet; use std::path::PathBuf; use std::{collections::BTreeMap, sync::Arc, time::Duration}; @@ -17,8 +19,11 @@ use axum::{ routing::{get, post, put}, Json, Router, }; +use node::account::AccountPublicKey; use node::p2p::connection::outgoing::P2pConnectionOutgoingInitOpts; +use node::p2p::webrtc::{Host, Offer, P2pConnectionResponse, SignalingMethod}; use node::transition_frontier::genesis::{GenesisConfig, PrebuiltGenesisConfig}; +use openmina_node_native::p2p::webrtc::webrtc_signal_send; use rand::{rngs::StdRng, Rng, SeedableRng}; use serde::{Deserialize, Serialize}; use tokio::net::TcpListener; @@ -27,14 +32,14 @@ use tokio::sync::{oneshot, Mutex, MutexGuard, OwnedMutexGuard}; use tower_http::cors::CorsLayer; use tower_http::services::ServeDir; -pub fn server(rt: Runtime, port: u16) { +pub fn server(rt: Runtime, host: Host, port: u16, ssl_port: Option) { let fe_dist_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")) .join("../../") .join("frontend/dist/frontend/"); eprintln!("scenarios path: {}", Scenario::PATH); eprintln!("FrontEnd dist path: {fe_dist_dir:?}"); - let state = AppState::new(); + let state = AppState::new(host, ssl_port); let scenarios_router = Router::new() .route("/", get(scenario_list)) @@ -47,12 +52,17 @@ pub fn server(rt: Runtime, port: u16) { .route("/", get(cluster_list)) .route("/create/:scenario_id", put(cluster_create)) .route("/:cluster_id", get(cluster_get)) + .nest("/:cluster_id/webnode", webnode::router()) .route("/:cluster_id/run", post(cluster_run)) .route("/:cluster_id/run/auto", post(cluster_run_auto)) .route( "/:cluster_id/scenarios/reload", post(cluster_scenarios_reload), ) + .route( + "/:cluster_id/mina/webrtc/signal/:offer", + get(cluster_webrtc_signal), + ) .route("/:cluster_id/seeds", get(cluster_seeds)) .route("/:cluster_id/genesis/config", get(cluster_genesis_config)) .route( @@ -66,27 +76,24 @@ pub fn server(rt: Runtime, port: u16) { .route("/:cluster_id/destroy", post(cluster_destroy)); let cors = CorsLayer::very_permissive(); + let coop_coep = middleware::from_fn(|req, next: middleware::Next| async { + let mut resp = next.run(req).await; + resp.headers_mut().insert( + header::HeaderName::from_static("cross-origin-embedder-policy"), + header::HeaderValue::from_static("require-corp"), + ); + resp.headers_mut().insert( + header::HeaderName::from_static("cross-origin-opener-policy"), + header::HeaderValue::from_static("same-origin"), + ); + resp + }); let app = Router::new() .nest("/scenarios", scenarios_router) .nest("/clusters", clusters_router) .nest("/simulations", simulator::simulations_router()) - .fallback( - get_service(ServeDir::new(fe_dist_dir)).layer(middleware::from_fn( - |req, next: middleware::Next| async { - let mut resp = next.run(req).await; - resp.headers_mut().insert( - header::HeaderName::from_static("cross-origin-embedder-policy"), - header::HeaderValue::from_static("require-corp"), - ); - resp.headers_mut().insert( - header::HeaderName::from_static("cross-origin-opener-policy"), - header::HeaderValue::from_static("same-origin"), - ); - resp - }, - )), - ) + .fallback(get_service(ServeDir::new(&fe_dist_dir)).layer(coop_coep.clone())) .with_state(state) .layer(cors); @@ -100,15 +107,22 @@ pub fn server(rt: Runtime, port: u16) { } pub struct AppStateInner { + host: Host, + ssl_port: Option, rng: StdRng, clusters: BTreeMap>>, + // TODO(binier): move inside cluster state + locked_block_producer_keys: BTreeMap>, } impl AppStateInner { - pub fn new() -> Self { + pub fn new(host: Host, ssl_port: Option) -> Self { Self { + host, + ssl_port, rng: StdRng::seed_from_u64(0), clusters: Default::default(), + locked_block_producer_keys: Default::default(), } } } @@ -117,8 +131,8 @@ impl AppStateInner { pub struct AppState(Arc>); impl AppState { - pub fn new() -> Self { - Self(Arc::new(Mutex::new(AppStateInner::new()))) + pub fn new(host: Host, ssl_port: Option) -> Self { + Self(Arc::new(Mutex::new(AppStateInner::new(host, ssl_port)))) } pub async fn lock(&self) -> MutexGuard<'_, AppStateInner> { @@ -129,20 +143,14 @@ impl AppState { &self, cluster_id: u16, ) -> Result>, (StatusCode, String)> { - let state = self.lock().await; - state.clusters.get(&cluster_id).cloned().ok_or_else(|| { - ( - StatusCode::BAD_REQUEST, - format!("cluster {cluster_id} not found"), - ) - }) + self.lock().await.cluster_mutex(cluster_id) } pub async fn cluster( &self, cluster_id: u16, ) -> Result, (StatusCode, String)> { - Ok(self.cluster_mutex(cluster_id).await?.lock_owned().await) + self.lock().await.cluster(cluster_id).await } pub async fn cluster_create( @@ -197,7 +205,27 @@ impl AppState { } pub async fn cluster_destroy(&self, cluster_id: u16) -> bool { - self.lock().await.clusters.remove(&cluster_id).is_some() + let mut this = self.lock().await; + this.locked_block_producer_keys.remove(&cluster_id); + this.clusters.remove(&cluster_id).is_some() + } +} + +impl AppStateInner { + fn cluster_mutex(&self, cluster_id: u16) -> Result>, (StatusCode, String)> { + self.clusters.get(&cluster_id).cloned().ok_or_else(|| { + ( + StatusCode::BAD_REQUEST, + format!("cluster {cluster_id} not found"), + ) + }) + } + + pub async fn cluster( + &self, + cluster_id: u16, + ) -> Result, (StatusCode, String)> { + Ok(self.cluster_mutex(cluster_id)?.lock_owned().await) } } @@ -433,21 +461,77 @@ async fn cluster_scenarios_reload( .map_err(|err| (StatusCode::INTERNAL_SERVER_ERROR, err.to_string())) } +async fn cluster_webrtc_signal( + State(state): State, + Path((cluster_id, offer)): Path<(u16, String)>, +) -> Result, (StatusCode, Json)> { + let offer: Offer = Err(()) + .or_else(move |_| { + let json = bs58::decode(&offer).into_vec().or(Err(()))?; + serde_json::from_slice(&json).or(Err(())) + }) + .map_err(|_| { + ( + StatusCode::BAD_REQUEST, + Json(P2pConnectionResponse::SignalDecryptionFailed), + ) + })?; + + let internal_err = || { + ( + StatusCode::INTERNAL_SERVER_ERROR, + Json(P2pConnectionResponse::InternalError), + ) + }; + + let http_url = { + let cluster = state + .cluster(cluster_id) + .await + .map_err(|_| internal_err())?; + let node = cluster + .node_by_peer_id(offer.target_peer_id) + .ok_or_else(internal_err)?; + let http_url = match node.dial_addr() { + P2pConnectionOutgoingInitOpts::WebRTC { signaling, .. } => signaling.http_url(), + _ => None, + }; + http_url.ok_or_else(internal_err)? + }; + let resp = webrtc_signal_send(&http_url, offer) + .await + .map_err(|_| internal_err())?; + Ok(Json(resp)) +} + async fn cluster_seeds( State(state): State, Path(cluster_id): Path, -) -> Result>, (StatusCode, String)> { - state - .cluster(cluster_id) - .await - .map(|cluster| { - cluster - .nodes_iter() - .filter(|(_, node)| node.config().initial_peers.is_empty()) - .map(|(_, node)| node.dial_addr()) - .collect() - }) - .map(Json) +) -> Result { + let state = state.lock().await; + let host = state.host.clone(); + let ssl_port = state.ssl_port; + state.cluster(cluster_id).await.map(|cluster| { + let list = cluster + .nodes_iter() + .filter(|(_, node)| node.config().initial_peers.is_empty()) + .map(|(_, node)| { + let mut addr = node.dial_addr(); + if let P2pConnectionOutgoingInitOpts::WebRTC { signaling, .. } = &mut addr { + if let SignalingMethod::Http(http) = signaling { + if let Some(port) = ssl_port { + http.host = host.clone(); + http.port = port; + *signaling = SignalingMethod::HttpsProxy(cluster_id, http.clone()); + } + } + } + addr = addr.to_string().parse().unwrap(); + addr.to_string() + }) + .collect::>(); + list.join("\n") + }) } async fn cluster_genesis_config( diff --git a/node/testing/src/server/simulator.rs b/node/testing/src/server/simulator.rs index a4669979f0..e033d53012 100644 --- a/node/testing/src/server/simulator.rs +++ b/node/testing/src/server/simulator.rs @@ -5,6 +5,7 @@ use axum::{ http::StatusCode, routing::put, }; +use mina_p2p_messages::v2; use openmina_core::channels::oneshot; use serde::{Deserialize, Serialize}; @@ -24,6 +25,8 @@ pub fn simulations_router() -> axum::Router { struct SimulationCreateArgs { cluster: ClusterConfig, simulator: SimulatorConfig, + #[serde(default)] + override_genesis_state_timestamp: bool, } #[derive(Serialize)] @@ -37,11 +40,18 @@ async fn simulation_create( ) -> Result, (StatusCode, String)> { async fn setup( state: AppState, - args: SimulationCreateArgs, + mut args: SimulationCreateArgs, ) -> Result<(u16, Simulator), (StatusCode, String)> { let (cluster_id, mut cluster) = state.cluster_create_empty(args.cluster).await?; let initial_time = redux::Timestamp::global_now(); + if args.override_genesis_state_timestamp { + Arc::get_mut(&mut args.simulator.genesis) + .unwrap() + .override_genesis_state_timestamp(v2::BlockTimeTimeStableV1( + (u64::from(initial_time) / 1_000_000).into(), + )); + } let mut simulator = Simulator::new(initial_time, args.simulator); simulator .setup(&mut ClusterRunner::new(&mut cluster, |_| {})) diff --git a/node/testing/src/server/webnode.rs b/node/testing/src/server/webnode.rs new file mode 100644 index 0000000000..6fde723bba --- /dev/null +++ b/node/testing/src/server/webnode.rs @@ -0,0 +1,74 @@ +use axum::{ + extract::{Path, State}, + http::StatusCode, + response::Redirect, + routing::get, +}; +use rand::prelude::*; + +use crate::scenarios::ClusterRunner; + +use super::AppState; + +pub fn router() -> axum::Router { + axum::Router::new() + .route("/", get(webnode_get)) + .route("/lock-random-bp", get(webnode_lock_random_bp)) +} + +async fn webnode_get( + State(state): State, + Path(cluster_id): Path, +) -> Result { + use base64::{engine::general_purpose::URL_SAFE, Engine as _}; + // make sure cluster exists + state.cluster_mutex(cluster_id).await?; + + let args = serde_json::json!({ + "network": cluster_id, + }) + .to_string(); + let args = URL_SAFE.encode(&args); + + Ok(Redirect::temporary(&format!("/?a={args}"))) +} + +async fn webnode_lock_random_bp( + State(state): State, + Path(cluster_id): Path, +) -> Result { + use base64::{engine::general_purpose::URL_SAFE, Engine as _}; + let mut state_guard = state.lock().await; + let state = &mut *state_guard; + let mut cluster = state.cluster(cluster_id).await?; + let runner = ClusterRunner::new(&mut cluster, |_| {}); + let locked_keys = state + .locked_block_producer_keys + .entry(cluster_id) + .or_default(); + + let (sec_key, _) = runner + .block_producer_sec_keys(runner.nodes_iter().next().unwrap().0) + .into_iter() + .filter(|(key, _)| !locked_keys.contains(&key.public_key())) + .choose(&mut state.rng) + .ok_or_else(|| { + ( + StatusCode::NOT_ACCEPTABLE, + "no more block producer keys available!".to_owned(), + ) + })?; + locked_keys.insert(sec_key.public_key()); + + let args = serde_json::json!({ + "network": cluster_id, + "block_producer": { + "sec_key": sec_key.to_string(), + "pub_key": sec_key.public_key().to_string(), + }, + }) + .to_string(); + let args = URL_SAFE.encode(&args); + + Ok(Redirect::temporary(&format!("/?a={args}"))) +} diff --git a/node/testing/src/simulator/mod.rs b/node/testing/src/simulator/mod.rs index 89a9e29dc4..aa9540eb52 100644 --- a/node/testing/src/simulator/mod.rs +++ b/node/testing/src/simulator/mod.rs @@ -19,6 +19,7 @@ use crate::{ pub struct Simulator { initial_time: redux::Timestamp, config: SimulatorConfig, + start_t: Option, } impl Simulator { @@ -26,6 +27,7 @@ impl Simulator { Self { initial_time, config, + start_t: None, } } @@ -230,7 +232,7 @@ impl Simulator { pub async fn run<'a>(&mut self, runner: &mut ClusterRunner<'a>) { let run_until = self.config.run_until.clone(); let advance_time = self.config.advance_time.clone(); - let start_t = redux::Instant::now(); + let start_t = *self.start_t.get_or_insert_with(redux::Instant::now); let mut last_printed_slot = 0; let virtual_initial_time = self.initial_time(); diff --git a/node/web/src/lib.rs b/node/web/src/lib.rs index d7c4c10946..02563f467d 100644 --- a/node/web/src/lib.rs +++ b/node/web/src/lib.rs @@ -1,5 +1,6 @@ #![cfg(target_family = "wasm")] +use ::node::transition_frontier::genesis::GenesisConfig; pub use openmina_node_common::*; mod rayon; @@ -31,7 +32,11 @@ fn main() { } #[wasm_bindgen] -pub async fn run(block_producer: Option) -> RpcSender { +pub async fn run( + block_producer: Option, + seed_nodes_url: Option, + genesis_config_url: Option, +) -> RpcSender { let block_producer: Option = block_producer.map(|key| { key.parse() .expect("failed to parse passed block producer keys") @@ -40,7 +45,7 @@ pub async fn run(block_producer: Option) -> RpcSender { let (rpc_sender_tx, rpc_sender_rx) = ::node::core::channels::oneshot::channel(); let _ = thread::spawn(move || { wasm_bindgen_futures::spawn_local(async move { - let mut node = setup_node(block_producer).await; + let mut node = setup_node(block_producer, seed_nodes_url, genesis_config_url).await; let _ = rpc_sender_tx.send(node.rpc()); node.run_forever().await; }); @@ -53,16 +58,38 @@ pub async fn run(block_producer: Option) -> RpcSender { async fn setup_node( block_producer: Option, + seed_nodes_url: Option, + genesis_config_url: Option, ) -> openmina_node_common::Node { let block_verifier_index = BlockVerifier::make().await; let work_verifier_index = TransactionVerifier::make().await; - let genesis_config = ::node::config::DEVNET_CONFIG.clone(); + let genesis_config = if let Some(genesis_config_url) = genesis_config_url { + let bytes = ::node::core::http::get_bytes(&genesis_config_url) + .await + .expect("failed to fetch genesis config"); + GenesisConfig::Prebuilt(bytes.into()).into() + } else { + ::node::config::DEVNET_CONFIG.clone() + }; + let mut node_builder: NodeBuilder = NodeBuilder::new(None, genesis_config); node_builder .block_verifier_index(block_verifier_index.clone()) .work_verifier_index(work_verifier_index.clone()); + // TODO(binier): refactor + if let Some(seed_nodes_url) = seed_nodes_url { + let peers = ::node::core::http::get_bytes(&seed_nodes_url) + .await + .expect("failed to fetch seed nodes"); + node_builder.initial_peers( + String::from_utf8_lossy(&peers) + .split("\n") + .map(|s| s.parse().expect("failed to parse seed node addr")), + ); + } + if let Some(bp_key) = block_producer { thread::spawn(move || { BlockProver::make(Some(block_verifier_index), Some(work_verifier_index)); diff --git a/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs b/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs index 00e6f45710..aefdc64f4c 100644 --- a/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs +++ b/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs @@ -56,6 +56,7 @@ pub enum P2pConnectionIncomingAction { peer_id: PeerId, }, /// Error establishing incoming connection. + #[action_event(level = warn, fields(display(peer_id), display(error)))] Error { peer_id: PeerId, error: P2pConnectionIncomingError, diff --git a/p2p/src/connection/outgoing/mod.rs b/p2p/src/connection/outgoing/mod.rs index e9b6bdf6ea..58dbb7d75d 100644 --- a/p2p/src/connection/outgoing/mod.rs +++ b/p2p/src/connection/outgoing/mod.rs @@ -278,6 +278,17 @@ impl P2pConnectionOutgoingInitOpts { (*peer_id).to_string().into_bytes().into(), ), }), + SignalingMethod::HttpsProxy(cluster_id, info) => { + Some(v2::NetworkPeerPeerStableV1 { + host: format!("https://{}/clusters/{cluster_id}", info.host) + .as_bytes() + .into(), + libp2p_port: (info.port as u64).into(), + peer_id: v2::NetworkPeerPeerIdStableV1( + (*peer_id).to_string().into_bytes().into(), + ), + }) + } SignalingMethod::P2p { .. } => None, }, } diff --git a/p2p/src/connection/outgoing_effectful/p2p_connection_outgoing_effectful_effects.rs b/p2p/src/connection/outgoing_effectful/p2p_connection_outgoing_effectful_effects.rs index 435ae8408d..c36bf8f7a2 100644 --- a/p2p/src/connection/outgoing_effectful/p2p_connection_outgoing_effectful_effects.rs +++ b/p2p/src/connection/outgoing_effectful/p2p_connection_outgoing_effectful_effects.rs @@ -55,7 +55,9 @@ impl P2pConnectionOutgoingEffectfulAction { _ => return, }; match signaling_method { - webrtc::SignalingMethod::Http(_) | webrtc::SignalingMethod::Https(_) => { + webrtc::SignalingMethod::Http(_) + | webrtc::SignalingMethod::Https(_) + | webrtc::SignalingMethod::HttpsProxy(_, _) => { let Some(url) = signaling_method.http_url() else { return; }; diff --git a/p2p/src/service_impl/webrtc/mod.rs b/p2p/src/service_impl/webrtc/mod.rs index 8704d4396f..8b669f9412 100644 --- a/p2p/src/service_impl/webrtc/mod.rs +++ b/p2p/src/service_impl/webrtc/mod.rs @@ -28,13 +28,20 @@ use crate::{ }; #[cfg(not(target_arch = "wasm32"))] -use self::native::{ - webrtc_signal_send, RTCChannel, RTCConnection, RTCConnectionState, RTCSignalingError, -}; +mod imports { + pub use super::native::{ + webrtc_signal_send, RTCChannel, RTCConnection, RTCConnectionState, RTCSignalingError, + }; +} #[cfg(target_arch = "wasm32")] -use self::web::{ - webrtc_signal_send, RTCChannel, RTCConnection, RTCConnectionState, RTCSignalingError, -}; +mod imports { + pub use super::web::{ + webrtc_signal_send, RTCChannel, RTCConnection, RTCConnectionState, RTCSignalingError, + }; +} + +use imports::*; +pub use imports::{webrtc_signal_send, RTCSignalingError}; use super::TaskSpawner; diff --git a/p2p/src/webrtc/signaling_method/mod.rs b/p2p/src/webrtc/signaling_method/mod.rs index ff09d5a7d8..73ae4e23d9 100644 --- a/p2p/src/webrtc/signaling_method/mod.rs +++ b/p2p/src/webrtc/signaling_method/mod.rs @@ -13,13 +13,17 @@ use crate::PeerId; pub enum SignalingMethod { Http(HttpSignalingInfo), Https(HttpSignalingInfo), - P2p { relay_peer_id: PeerId }, + /// Proxy used as an SSL gateway to the actual signaling server. + HttpsProxy(u16, HttpSignalingInfo), + P2p { + relay_peer_id: PeerId, + }, } impl SignalingMethod { pub fn can_connect_directly(&self) -> bool { match self { - Self::Http(_) | Self::Https(_) => true, + Self::Http(_) | Self::Https(_) | Self::HttpsProxy(_, _) => true, Self::P2p { .. } => false, } } @@ -30,6 +34,12 @@ impl SignalingMethod { let (http, info) = match self { Self::Http(info) => ("http", info), Self::Https(info) => ("https", info), + Self::HttpsProxy(cluster_id, info) => { + return Some(format!( + "https://{}:{}/clusters/{}/mina/webrtc/signal", + info.host, info.port, cluster_id + )); + } _ => return None, }; Some(format!( @@ -57,6 +67,10 @@ impl fmt::Display for SignalingMethod { write!(f, "/https")?; signaling.fmt(f) } + Self::HttpsProxy(cluster_id, signaling) => { + write!(f, "/https_proxy/{cluster_id}")?; + signaling.fmt(f) + } Self::P2p { relay_peer_id } => { write!(f, "/p2p/{relay_peer_id}") } @@ -70,6 +84,8 @@ pub enum SignalingMethodParseError { NotEnoughArgs, #[error("unknown signaling method: `{0}`")] UnknownSignalingMethod(String), + #[error("invalid cluster id")] + InvalidClusterId, #[error("host parse error: {0}")] HostParseError(String), #[error("host parse error: {0}")] @@ -90,9 +106,23 @@ impl FromStr for SignalingMethod { .filter(|i| s.len() > *i) .ok_or(SignalingMethodParseError::NotEnoughArgs)?; + let rest = &s[method_end_index..]; match &s[1..method_end_index] { - "http" => Ok(Self::Http(s[method_end_index..].parse()?)), - "https" => Ok(Self::Https(s[method_end_index..].parse()?)), + "http" => Ok(Self::Http(rest.parse()?)), + "https" => Ok(Self::Https(rest.parse()?)), + "https_proxy" => { + let mut iter = rest.splitn(3, '/').filter(|v| !v.trim().is_empty()); + let (cluster_id, rest) = ( + iter.next() + .ok_or(SignalingMethodParseError::NotEnoughArgs)?, + iter.next() + .ok_or(SignalingMethodParseError::NotEnoughArgs)?, + ); + let cluster_id: u16 = cluster_id + .parse() + .or(Err(SignalingMethodParseError::InvalidClusterId))?; + Ok(Self::HttpsProxy(cluster_id, rest.parse()?)) + } method => Err(SignalingMethodParseError::UnknownSignalingMethod( method.to_owned(), )), From f784ccc09f4e7a658a1900bb1e32942efc0d61ea Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Tue, 12 Nov 2024 07:50:19 +0400 Subject: [PATCH 060/175] feat(node): delay genesis proof production as much as possible, to maybe avoid it if possible --- node/src/action_kind.rs | 4 +- .../block_producer/block_producer_actions.rs | 17 +++++-- .../block_producer/block_producer_reducer.rs | 48 ++++++++++--------- .../block_producer/block_producer_state.rs | 2 +- node/src/effects.rs | 2 + node/src/state.rs | 26 +++++----- .../transition_frontier_genesis_actions.rs | 2 +- .../sync/transition_frontier_sync_actions.rs | 2 +- .../transition_frontier_actions.rs | 24 ++++++---- .../transition_frontier_effects.rs | 11 ++++- .../transition_frontier_reducer.rs | 19 ++++++-- 11 files changed, 103 insertions(+), 54 deletions(-) diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index d5dc25d10d..cee7438a5d 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -616,6 +616,7 @@ pub enum ActionKind { TransactionPoolVerifyError, TransactionPoolEffectfulFetchAccounts, TransitionFrontierGenesisInject, + TransitionFrontierGenesisProvenInject, TransitionFrontierSyncFailed, TransitionFrontierSynced, TransitionFrontierGenesisLedgerLoadInit, @@ -705,7 +706,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 590; + pub const COUNT: u16 = 591; } impl std::fmt::Display for ActionKind { @@ -859,6 +860,7 @@ impl ActionKindGet for TransitionFrontierAction { Self::GenesisEffect(a) => a.kind(), Self::Sync(a) => a.kind(), Self::GenesisInject => ActionKind::TransitionFrontierGenesisInject, + Self::GenesisProvenInject => ActionKind::TransitionFrontierGenesisProvenInject, Self::Synced { .. } => ActionKind::TransitionFrontierSynced, Self::SyncFailed { .. } => ActionKind::TransitionFrontierSyncFailed, } diff --git a/node/src/block_producer/block_producer_actions.rs b/node/src/block_producer/block_producer_actions.rs index 5b33c7f7cf..7f0cd7f519 100644 --- a/node/src/block_producer/block_producer_actions.rs +++ b/node/src/block_producer/block_producer_actions.rs @@ -1,3 +1,5 @@ +use std::sync::Arc; + use ledger::scan_state::transaction_logic::valid; use mina_p2p_messages::v2::MinaBaseProofStableV2; use openmina_core::block::ArcBlockWithHash; @@ -100,9 +102,18 @@ impl redux::EnablingCondition for BlockProducerAction { BlockProducerAction::WonSlotWait => state .block_producer .with(false, |this| this.current.won_slot_should_wait(time)), - BlockProducerAction::WonSlotProduceInit { .. } => state - .block_producer - .with(false, |this| this.current.won_slot_should_produce(time)), + BlockProducerAction::WonSlotProduceInit { .. } => { + state.block_producer.with(false, |this| { + let has_genesis_proven_if_needed = || { + state.transition_frontier.best_tip().map_or(false, |tip| { + let proven_block = state.transition_frontier.genesis.proven_block(); + !tip.is_genesis() + || proven_block.map_or(false, |b| Arc::ptr_eq(&b.block, &tip.block)) + }) + }; + this.current.won_slot_should_produce(time) && has_genesis_proven_if_needed() + }) + } BlockProducerAction::WonSlotTransactionsGet => { state.block_producer.with(false, |this| { matches!( diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index f9cca60e45..4c3165cb27 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -104,6 +104,31 @@ impl BlockProducerEnabled { }; } } + BlockProducerAction::WonSlotProduceInit => { + if let Some(won_slot) = state.current.won_slot() { + if let Some(chain) = best_chain.last().map(|best_tip| { + if best_tip.global_slot() == won_slot.global_slot() { + // We are producing block which replaces current best tip + // instead of extending it. + best_chain + .get(..best_chain.len().saturating_sub(1)) + .unwrap_or(&[]) + .to_vec() + } else { + best_chain.to_vec() + } + }) { + state.current = BlockProducerCurrentState::WonSlotProduceInit { + time: meta.time(), + won_slot: won_slot.clone(), + chain, + }; + }; + } + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(BlockProducerAction::WonSlotTransactionsGet); + } BlockProducerAction::WonSlotTransactionsGet => { let BlockProducerCurrentState::WonSlotProduceInit { won_slot, chain, .. @@ -141,29 +166,6 @@ impl BlockProducerEnabled { let dispatcher = state_context.into_dispatcher(); dispatcher.push(BlockProducerAction::StagedLedgerDiffCreateInit); } - BlockProducerAction::WonSlotProduceInit => { - if let Some(won_slot) = state.current.won_slot() { - if let Some(chain) = best_chain.last().map(|best_tip| { - if best_tip.global_slot() == won_slot.global_slot() { - best_chain - .get(..best_chain.len().saturating_sub(1)) - .unwrap_or(&[]) - .to_vec() - } else { - best_chain.to_vec() - } - }) { - state.current = BlockProducerCurrentState::WonSlotProduceInit { - time: meta.time(), - won_slot: won_slot.clone(), - chain, - }; - }; - } - - let dispatcher = state_context.into_dispatcher(); - dispatcher.push(BlockProducerAction::WonSlotTransactionsGet); - } BlockProducerAction::StagedLedgerDiffCreateInit => { let dispatcher = state_context.into_dispatcher(); dispatcher.push(BlockProducerEffectfulAction::StagedLedgerDiffCreateInit); diff --git a/node/src/block_producer/block_producer_state.rs b/node/src/block_producer/block_producer_state.rs index 384d1ad8c2..b16d1bd1d4 100644 --- a/node/src/block_producer/block_producer_state.rs +++ b/node/src/block_producer/block_producer_state.rs @@ -296,7 +296,7 @@ impl BlockProducerCurrentState { #[cfg(not(target_arch = "wasm32"))] const BLOCK_PRODUCTION_ESTIMATE: u64 = Duration::from_secs(5).as_nanos() as u64; #[cfg(target_arch = "wasm32")] - const BLOCK_PRODUCTION_ESTIMATE: u64 = Duration::from_secs(20).as_nanos() as u64; + const BLOCK_PRODUCTION_ESTIMATE: u64 = Duration::from_secs(18).as_nanos() as u64; let slot_interval = Duration::from_secs(3 * 60).as_nanos() as u64; match self { diff --git a/node/src/effects.rs b/node/src/effects.rs index 88c051216a..8aad7a94ab 100644 --- a/node/src/effects.rs +++ b/node/src/effects.rs @@ -37,6 +37,8 @@ pub fn effects(store: &mut Store, action: ActionWithMeta) { store.dispatch(TransitionFrontierGenesisAction::LedgerLoadInit); store.dispatch(ExternalSnarkWorkerAction::Start); + store.dispatch(TransitionFrontierGenesisAction::ProveInit); + if store.state().p2p.ready().is_some() { p2p_request_best_tip_if_needed(store); p2p_request_transactions_if_needed(store); diff --git a/node/src/state.rs b/node/src/state.rs index 9b5049af1b..6dba81f5dd 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -1,4 +1,5 @@ use std::sync::Arc; +use std::time::Duration; use mina_p2p_messages::v2::{MinaBaseUserCommandStableV2, MinaBlockBlockStableV2}; use rand::prelude::*; @@ -333,17 +334,20 @@ impl State { ) } - pub fn should_produce_blocks_after_genesis(&self) -> bool { - self.block_producer.is_enabled() - && self.genesis_block().map_or(false, |b| { - let slot = &b.consensus_state().curr_global_slot_since_hard_fork; - let epoch = slot - .slot_number - .as_u32() - .checked_div(slot.slots_per_epoch.as_u32()) - .expect("division by 0"); - self.current_epoch() <= Some(epoch) - }) + pub fn producing_block_after_genesis(&self) -> bool { + #[allow(clippy::arithmetic_side_effects)] + let two_mins_in_future = self.time() + Duration::from_secs(2 * 60); + self.block_producer.with(false, |bp| { + bp.current.won_slot_should_produce(two_mins_in_future) + }) && self.genesis_block().map_or(false, |b| { + let slot = &b.consensus_state().curr_global_slot_since_hard_fork; + let epoch = slot + .slot_number + .as_u32() + .checked_div(slot.slots_per_epoch.as_u32()) + .expect("division by 0"); + self.current_epoch() <= Some(epoch) + }) } pub fn should_log_node_id(&self) -> bool { diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs index a53ab8c993..94ef1405e1 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs @@ -51,7 +51,7 @@ impl redux::EnablingCondition for TransitionFrontierGenesisAction TransitionFrontierGenesisState::LedgerLoadSuccess { .. } ), TransitionFrontierGenesisAction::ProveInit => { - state.should_produce_blocks_after_genesis() + state.producing_block_after_genesis() && matches!( genesis_state, TransitionFrontierGenesisState::Produced { .. } diff --git a/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs b/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs index c2c37d4857..cb686091d7 100644 --- a/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs +++ b/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs @@ -146,7 +146,7 @@ impl redux::EnablingCondition for TransitionFrontierSyncAction { && state .transition_frontier .best_tip() - .map_or(true, |tip| best_tip.hash != tip.hash) + .map_or(false, |tip| best_tip.hash != tip.hash) && state .transition_frontier .sync diff --git a/node/src/transition_frontier/transition_frontier_actions.rs b/node/src/transition_frontier/transition_frontier_actions.rs index bdd6c4f73e..679cafa3dc 100644 --- a/node/src/transition_frontier/transition_frontier_actions.rs +++ b/node/src/transition_frontier/transition_frontier_actions.rs @@ -1,4 +1,5 @@ use std::collections::BTreeSet; +use std::sync::Arc; use mina_p2p_messages::v2::StateHash; use openmina_core::block::ArcBlockWithHash; @@ -25,6 +26,8 @@ pub enum TransitionFrontierAction { /// block, otherwise we don't need it so we use dummy proof instead. #[action_event(level = info)] GenesisInject, + #[action_event(level = info)] + GenesisProvenInject, Sync(TransitionFrontierSyncAction), /// Transition frontier synced. @@ -44,15 +47,20 @@ impl redux::EnablingCondition for TransitionFrontierAction { TransitionFrontierAction::Genesis(a) => a.is_enabled(state, time), TransitionFrontierAction::GenesisEffect(a) => a.is_enabled(state, time), TransitionFrontierAction::GenesisInject => { - if state.transition_frontier.best_tip().is_some() { + state.transition_frontier.root().is_none() + && state + .transition_frontier + .genesis + .block_with_real_or_dummy_proof() + .is_some() + } + TransitionFrontierAction::GenesisProvenInject => { + let Some(genesis) = state.transition_frontier.genesis.proven_block() else { return false; - } - let genesis_state = &state.transition_frontier.genesis; - if state.should_produce_blocks_after_genesis() { - genesis_state.proven_block().is_some() - } else { - genesis_state.block_with_dummy_proof().is_some() - } + }; + state.transition_frontier.root().map_or(true, |b| { + b.is_genesis() && !Arc::ptr_eq(&genesis.block, &b.block) + }) } TransitionFrontierAction::Sync(a) => a.is_enabled(state, time), TransitionFrontierAction::Synced { .. } => matches!( diff --git a/node/src/transition_frontier/transition_frontier_effects.rs b/node/src/transition_frontier/transition_frontier_effects.rs index 9597d639f9..c8b2ae97fe 100644 --- a/node/src/transition_frontier/transition_frontier_effects.rs +++ b/node/src/transition_frontier/transition_frontier_effects.rs @@ -34,10 +34,12 @@ pub fn transition_frontier_effects( // TODO(refactor): this should be handled by a callback and removed from here // whenever any of these is going to happen, genesisinject must happen first match &a { - TransitionFrontierGenesisAction::Produce - | TransitionFrontierGenesisAction::ProveSuccess { .. } => { + TransitionFrontierGenesisAction::Produce => { store.dispatch(TransitionFrontierAction::GenesisInject); } + TransitionFrontierGenesisAction::ProveSuccess { .. } => { + store.dispatch(TransitionFrontierAction::GenesisProvenInject); + } _ => {} } } @@ -47,6 +49,11 @@ pub fn transition_frontier_effects( TransitionFrontierAction::GenesisInject => { synced_effects(&meta, store); } + TransitionFrontierAction::GenesisProvenInject => { + if store.state().transition_frontier.sync.is_synced() { + synced_effects(&meta, store); + } + } TransitionFrontierAction::Sync(a) => { match a { TransitionFrontierSyncAction::Init { diff --git a/node/src/transition_frontier/transition_frontier_reducer.rs b/node/src/transition_frontier/transition_frontier_reducer.rs index 420a447c83..559e2f7e6d 100644 --- a/node/src/transition_frontier/transition_frontier_reducer.rs +++ b/node/src/transition_frontier/transition_frontier_reducer.rs @@ -34,9 +34,22 @@ impl TransitionFrontierState { block: genesis, just_emitted_a_proof: true, }; - let new_chain = vec![genesis]; - state.chain_diff = state.maybe_make_chain_diff(&new_chain); - state.best_chain = new_chain; + state.best_chain = vec![genesis]; + state.sync = TransitionFrontierSyncState::Synced { time: meta.time() }; + } + TransitionFrontierAction::GenesisProvenInject => { + let Some(genesis) = state.genesis.proven_block() else { + return; + }; + if let Some(block) = state.best_chain.get_mut(0) { + block.block = genesis.clone(); + } else { + let genesis = AppliedBlock { + block: genesis.clone(), + just_emitted_a_proof: true, + }; + state.best_chain = vec![genesis]; + } if !state.sync.is_pending() { state.sync = TransitionFrontierSyncState::Synced { time: meta.time() }; } From edae0cfcfc9c56f63d1d928374360c89cf7d6db6 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Wed, 13 Nov 2024 14:51:09 +0400 Subject: [PATCH 061/175] chore(p2p): adjust timeouts for slower network --- p2p/src/channels/streaming_rpc/rpcs/mod.rs | 2 +- p2p/src/p2p_config.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/p2p/src/channels/streaming_rpc/rpcs/mod.rs b/p2p/src/channels/streaming_rpc/rpcs/mod.rs index 4330b3c431..5b2daaf9e5 100644 --- a/p2p/src/channels/streaming_rpc/rpcs/mod.rs +++ b/p2p/src/channels/streaming_rpc/rpcs/mod.rs @@ -47,7 +47,7 @@ impl P2pStreamingRpcKind { pub fn timeout(self, _config: &P2pTimeouts) -> Option { match self { // TODO(binier): use config - Self::StagedLedgerParts => Some(Duration::from_secs(20)), + Self::StagedLedgerParts => Some(Duration::from_secs(30)), } } } diff --git a/p2p/src/p2p_config.rs b/p2p/src/p2p_config.rs index dc0be207f8..61e46a4d2c 100644 --- a/p2p/src/p2p_config.rs +++ b/p2p/src/p2p_config.rs @@ -99,7 +99,7 @@ impl Default for P2pTimeouts { ), outgoing_connection_timeout: from_env_or( "OUTGOING_CONNECTION_TIMEOUT", - Some(Duration::from_secs(10)), + Some(Duration::from_secs(15)), ), reconnect_timeout: from_env_or("RECONNECT_TIMEOUT", Some(Duration::from_secs(1))), incoming_error_reconnect_timeout: from_env_or( @@ -112,15 +112,15 @@ impl Default for P2pTimeouts { ), best_tip_with_proof: from_env_or( "BEST_TIP_WITH_PROOF_TIMEOUT", - Some(Duration::from_secs(10)), + Some(Duration::from_secs(15)), ), - ledger_query: from_env_or("LEDGER_QUERY_TIMEOUT", Some(Duration::from_secs(2))), + ledger_query: from_env_or("LEDGER_QUERY_TIMEOUT", Some(Duration::from_secs(4))), staged_ledger_aux_and_pending_coinbases_at_block: from_env_or( "STAGED_LEDGER_AUX_AND_PENDING_COINBASES_AT_BLOCK_TIMEOUT", - Some(Duration::from_secs(120)), + Some(Duration::from_secs(180)), ), - block: from_env_or("BLOCK_TIMEOUT", Some(Duration::from_secs(5))), - snark: from_env_or("SNARK_TIMEOUT", Some(Duration::from_secs(5))), + block: from_env_or("BLOCK_TIMEOUT", Some(Duration::from_secs(8))), + snark: from_env_or("SNARK_TIMEOUT", Some(Duration::from_secs(8))), initial_peers: from_env_or("INITIAL_PEERS_TIMEOUT", Some(Duration::from_secs(5))), kademlia_bootstrap: from_env_or( "KADEMLIA_BOOTSTRAP_TIMEOUT", From 924db220af88b1a8fd052ab1a23fddc3cfb02b11 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Wed, 13 Nov 2024 14:51:40 +0400 Subject: [PATCH 062/175] chore(p2p/webrtc): add openmina stun server --- p2p/src/service_impl/webrtc/mod.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/p2p/src/service_impl/webrtc/mod.rs b/p2p/src/service_impl/webrtc/mod.rs index 8b669f9412..e57589ae4d 100644 --- a/p2p/src/service_impl/webrtc/mod.rs +++ b/p2p/src/service_impl/webrtc/mod.rs @@ -149,11 +149,11 @@ pub struct RTCChannelConfig { impl Default for RTCConfigIceServers { fn default() -> Self { Self(vec![ - // RTCConfigIceServer { - // urls: vec!["stun:65.109.110.75:3478".to_owned()], - // username: Some("openmina".to_owned()), - // credential: Some("webrtc".to_owned()), - // }, + RTCConfigIceServer { + urls: vec!["stun:65.109.110.75:3478".to_owned()], + username: Some("openmina".to_owned()), + credential: Some("webrtc".to_owned()), + }, RTCConfigIceServer { urls: vec![ "stun:stun.l.google.com:19302".to_owned(), From 3a0ffbf291953e0c5fa4f1d64a7ac8edfa64ff08 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:03:35 +0200 Subject: [PATCH 063/175] Frontend - Sentry source maps (#904) mime type forcing for wasm files Source map tests --- frontend/.gitignore | 3 + frontend/angular.json | 1 + frontend/package-lock.json | 247 ++++++++++++++++++++++++++++++++++++- frontend/package.json | 8 +- 4 files changed, 251 insertions(+), 8 deletions(-) diff --git a/frontend/.gitignore b/frontend/.gitignore index e10321af5a..565a858b64 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -44,3 +44,6 @@ Thumbs.db # Open Mina /src/assets/webnode/pkg /src/assets/webnode/circuit-blobs + +# Sentry Config File +.sentryclirc diff --git a/frontend/angular.json b/frontend/angular.json index e7410b08a6..b5ca30487d 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -46,6 +46,7 @@ "assets": [ "src/assets" ], + "sourceMap": true, "styles": [ "src/styles.scss" ], diff --git a/frontend/package-lock.json b/frontend/package-lock.json index af771f478e..8689324cc1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -28,6 +28,7 @@ "@nguniversal/express-engine": "^7.0.2", "@openmina/shared": "^0.107.0", "@sentry/angular": "^8.35.0", + "@sentry/cli": "^2.38.2", "@sentry/tracing": "^7.114.0", "base-x": "^5.0.0", "bs58check": "^4.0.0", @@ -5203,6 +5204,196 @@ "node": ">=14.18" } }, + "node_modules/@sentry/cli": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.38.2.tgz", + "integrity": "sha512-CR0oujpAnhegK2pBAv6ZReMqbFTuNJLDZLvoD1B+syrKZX+R+oxkgT2e1htsBbht+wGxAsluVWsIAydSws1GAA==", + "hasInstallScript": true, + "license": "BSD-3-Clause", + "dependencies": { + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.7", + "progress": "^2.0.3", + "proxy-from-env": "^1.1.0", + "which": "^2.0.2" + }, + "bin": { + "sentry-cli": "bin/sentry-cli" + }, + "engines": { + "node": ">= 10" + }, + "optionalDependencies": { + "@sentry/cli-darwin": "2.38.2", + "@sentry/cli-linux-arm": "2.38.2", + "@sentry/cli-linux-arm64": "2.38.2", + "@sentry/cli-linux-i686": "2.38.2", + "@sentry/cli-linux-x64": "2.38.2", + "@sentry/cli-win32-i686": "2.38.2", + "@sentry/cli-win32-x64": "2.38.2" + } + }, + "node_modules/@sentry/cli-darwin": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.38.2.tgz", + "integrity": "sha512-21ywIcJCCFrCTyiF1o1PaT7rbelFC2fWmayKYgFElnQ55IzNYkcn8BYhbh/QknE0l1NBRaeWMXwTTdeoqETCCg==", + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-linux-arm": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.38.2.tgz", + "integrity": "sha512-+AiKDBQKIdQe4NhBiHSHGl0KR+b//HHTrnfK1SaTrOm9HtM4ELXAkjkRF3bmbpSzSQCS5WzcbIxxCJOeaUaO0A==", + "cpu": [ + "arm" + ], + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-linux-arm64": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.38.2.tgz", + "integrity": "sha512-4Fp/jjQpNZj4Th+ZckMQvldAuuP0ZcyJ9tJCP1CCOn5poIKPYtY6zcbTP036R7Te14PS4ALOcDNX3VNKfpsifA==", + "cpu": [ + "arm64" + ], + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-linux-i686": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.38.2.tgz", + "integrity": "sha512-6zVJN10dHIn4R1v+fxuzlblzVBhIVwsaN/S7aBED6Vn1HhAyAcNG2tIzeCLGeDfieYjXlE2sCI82sZkQBCbAGw==", + "cpu": [ + "x86", + "ia32" + ], + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-linux-x64": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.38.2.tgz", + "integrity": "sha512-4UiLu9zdVtqPeltELR5MDGKcuqAdQY9xz3emISuA6bm+MXGbt2W1WgX+XY3GElwjZbmH8qpyLUEd34sw6sdcbQ==", + "cpu": [ + "x64" + ], + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-win32-i686": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.38.2.tgz", + "integrity": "sha512-DYfSvd5qLPerLpIxj3Xu2rRe3CIlpGOOfGSNI6xvJ5D8j6hqbOHlCzvfC4oBWYVYGtxnwQLMeDGJ7o7RMYulig==", + "cpu": [ + "x86", + "ia32" + ], + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-win32-x64": { + "version": "2.38.2", + "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.38.2.tgz", + "integrity": "sha512-W5UX58PKY1hNUHo9YJxWNhGvgvv2uOYHI27KchRiUvFYBIqlUUcIdPZDfyzetDfd8qBCxlAsFnkL2VJSNdpA9A==", + "cpu": [ + "x64" + ], + "license": "BSD-3-Clause", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/@sentry/cli/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@sentry/cli/node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/@sentry/cli/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@sentry/core": { "version": "8.35.0", "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.35.0.tgz", @@ -8690,7 +8881,6 @@ }, "node_modules/debug": { "version": "4.3.4", - "dev": true, "license": "MIT", "dependencies": { "ms": "2.1.2" @@ -9064,7 +9254,6 @@ "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -9074,7 +9263,6 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -10928,7 +11116,6 @@ }, "node_modules/isexe": { "version": "2.0.0", - "dev": true, "license": "ISC" }, "node_modules/isobject": { @@ -12227,7 +12414,6 @@ }, "node_modules/ms": { "version": "2.1.2", - "dev": true, "license": "MIT" }, "node_modules/multicast-dns": { @@ -12347,6 +12533,26 @@ "dev": true, "optional": true }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", @@ -13440,6 +13646,15 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -15263,6 +15478,12 @@ "node": ">= 4.0.0" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, "node_modules/tree-kill": { "version": "1.2.2", "dev": true, @@ -16176,6 +16397,12 @@ "defaults": "^1.0.3" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, "node_modules/webpack": { "version": "5.94.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", @@ -16529,6 +16756,16 @@ "node": ">=0.8.0" } }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "1.3.1", "dev": true, diff --git a/frontend/package.json b/frontend/package.json index d329046069..867bde01a2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,7 @@ "start:dev": "ng serve --configuration development", "start:dev:mobile": "ng serve --configuration development --host 0.0.0.0", "build": "ng build", - "build:prod": "ng build --configuration production", + "build:prod": "ng build --configuration production && npm run sentry:sourcemaps", "tests": "npx cypress open --config baseUrl=http://localhost:4200", "tests:headless": "npx cypress run --headless --config baseUrl=http://localhost:4200", "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t openmina/frontend:latest . && docker push openmina/frontend:latest", @@ -16,7 +16,8 @@ "dev:ssr": "ng run frontend:serve-ssr", "serve:ssr": "node dist/frontend/server/main.js", "build:ssr": "ng build && ng run frontend:server", - "prerender": "ng run frontend:prerender" + "prerender": "ng run frontend:prerender", + "sentry:sourcemaps": "sentry-cli sourcemaps inject --org openmina-uv --project openmina ./dist/frontend/browser && sentry-cli sourcemaps upload --org openmina-uv --project openmina ./dist/frontend/browser" }, "private": true, "dependencies": { @@ -40,6 +41,7 @@ "@nguniversal/express-engine": "^7.0.2", "@openmina/shared": "^0.107.0", "@sentry/angular": "^8.35.0", + "@sentry/cli": "^2.38.2", "@sentry/tracing": "^7.114.0", "base-x": "^5.0.0", "bs58check": "^4.0.0", @@ -80,4 +82,4 @@ "webpack": "^5.88.2", "webpack-bundle-analyzer": "^4.9.0" } -} +} \ No newline at end of file From 36a81f1579093d2c924ce944773dc2214c49c59d Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Thu, 14 Nov 2024 15:15:19 +0400 Subject: [PATCH 064/175] fix(node/replay): postcard deserialization failure --- .../genesis/transition_frontier_genesis_config.rs | 1 - node/testing/src/server/simulator.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs index 6ae8c089d6..3b561d8776 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_config.rs @@ -33,7 +33,6 @@ use crate::{ pub use GenesisConfig as TransitionFrontierGenesisConfig; #[derive(Serialize, Deserialize, Debug, Clone)] -#[serde(tag = "kind")] pub enum GenesisConfig { Counts { whales: usize, diff --git a/node/testing/src/server/simulator.rs b/node/testing/src/server/simulator.rs index e033d53012..f4df9a0df1 100644 --- a/node/testing/src/server/simulator.rs +++ b/node/testing/src/server/simulator.rs @@ -84,7 +84,7 @@ async fn simulation_create( }; while let Some(cluster_mutex) = cluster_mutex.upgrade() { let mut cluster = cluster_mutex.lock().await; - let mut runner = ClusterRunner::new(&mut *cluster, |_| {}); + let mut runner = ClusterRunner::new(&mut cluster, |_| {}); let _ = tokio::time::timeout(Duration::from_millis(500), simulator.run(&mut runner)) .await; @@ -93,5 +93,5 @@ async fn simulation_create( }); let cluster_id = setup_rx.await.unwrap()?; - Ok(SimulationCreateResponse { cluster_id }).map(Json) + Ok(Json(SimulationCreateResponse { cluster_id })) } From 56be60da37155507f45c48f8368e598a995318fb Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:46:31 +0200 Subject: [PATCH 065/175] Frontend - Javascript Mime Type (#905) Frontend - Javascript Mime Type --- frontend/httpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 6008c20a62..f75625f29a 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -499,7 +499,7 @@ LogLevel warn AddType application/x-compress .Z AddType application/x-gzip .gz .tgz AddType application/wasm .wasm - + AddType application/javascript .js # # AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server From 4bff13c786b761833fbb48f0064ea0ed6d016f80 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Thu, 14 Nov 2024 14:12:13 +0200 Subject: [PATCH 066/175] Frontend - Force Javascript Mime Type in Apache (#906) --- frontend/httpd.conf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index f75625f29a..24de676dd5 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -523,6 +523,23 @@ LogLevel warn #AddOutputFilter INCLUDES .shtml +# Specific handling for webnode JS files + + # Force JavaScript MIME type + ForceType application/javascript + + # Ensure these files are not rewritten + RewriteEngine Off + + # Debug headers + Header set X-Content-Debug "%{CONTENT_TYPE}e" + Header set X-Handler-Debug "%{HANDLER}e" + + # Ensure proper CORS headers + Header set Access-Control-Allow-Origin "*" + Header set Access-Control-Allow-Methods "GET, OPTIONS" + + # # The mod_mime_magic module allows the server to use various hints from the # contents of the file itself to determine its type. The MIMEMagicFile From 15996f554537f9de1ae3c35b4a961976da7ec7f0 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Thu, 14 Nov 2024 14:53:44 +0200 Subject: [PATCH 067/175] Frontend - No cache for index.html (#907) --- frontend/httpd.conf | 3 ++- frontend/src/index.html | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 24de676dd5..4112d112d5 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -212,7 +212,8 @@ LoadModule rewrite_module modules/mod_rewrite.so RewriteRule ^ - [L] # If the requested resource doesn't exist, use index.html - RewriteRule ^ /index.html + RewriteCond %{REQUEST_URI} ^/index\.html$ + RewriteRule ^(.*)$ $1?bust=$RANDOM [L,QSA] SSLProxyEngine On diff --git a/frontend/src/index.html b/frontend/src/index.html index a890247d0c..b216014a4c 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -28,6 +28,11 @@ + + + + + Open Mina From 699cccaba4028345860000d049d75f18ba6a3c21 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:46:44 +0200 Subject: [PATCH 068/175] Frontend - Firebase configuration (#908) --- frontend/.gitignore | 5 + frontend/Dockerfile | 1 + frontend/firebase.json | 40 + frontend/package-lock.json | 4710 +++++++++++------ frontend/package.json | 8 +- frontend/scripts/download-webnode.sh | 60 + frontend/src/app/app.module.ts | 31 +- .../app/core/helpers/file-progress.helper.ts | 6 +- frontend/src/assets/environments/webnode.js | 2 +- frontend/src/assets/webnode/.gitignore | 2 + 10 files changed, 3330 insertions(+), 1535 deletions(-) create mode 100644 frontend/firebase.json create mode 100644 frontend/scripts/download-webnode.sh diff --git a/frontend/.gitignore b/frontend/.gitignore index 565a858b64..bf0f3a86c7 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -47,3 +47,8 @@ Thumbs.db # Sentry Config File .sentryclirc + +# Firebase +.firebase +*-debug.log +.runtimeconfig.json diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 443affcf62..ad489347c7 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -9,6 +9,7 @@ RUN npm prune --production RUN echo "---------- USING APACHE ----------" + FROM httpd:2.4 RUN apt-get update && \ diff --git a/frontend/firebase.json b/frontend/firebase.json new file mode 100644 index 0000000000..7c5ecc4125 --- /dev/null +++ b/frontend/firebase.json @@ -0,0 +1,40 @@ +{ + "hosting": { + "public": "dist/frontend/browser", + "ignore": [ + "firebase.json", + "**/.*", + "**/node_modules/**" + ], + "rewrites": [ + { + "source": "**", + "destination": "/index.html" + } + ], + "headers": [ + { + "source": "/service-worker.js", + "headers": [ + { + "key": "Cache-Control", + "value": "no-cache" + } + ] + }, + { + "source": "/**", + "headers": [ + { + "key": "Cross-Origin-Opener-Policy", + "value": "same-origin" + }, + { + "key": "Cross-Origin-Embedder-Policy", + "value": "require-corp" + } + ] + } + ] + } +} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8689324cc1..c00ab4334d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -13,6 +13,7 @@ "@angular/common": "^17.3.12", "@angular/compiler": "^17.3.12", "@angular/core": "^17.3.12", + "@angular/fire": "^17.1.0", "@angular/forms": "^17.3.12", "@angular/material": "^17.3.10", "@angular/platform-browser": "^17.3.12", @@ -36,6 +37,7 @@ "d3": "^7.8.4", "eigen": "^0.2.2", "express": "^4.18.2", + "firebase": "^11.0.1", "mathjs": "^12.3.0", "mina-signer": "^3.0.7", "ngx-json-viewer": "^3.2.1", @@ -564,7 +566,6 @@ "version": "17.3.10", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.10.tgz", "integrity": "sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==", - "dev": true, "dependencies": { "ajv": "8.12.0", "ajv-formats": "2.1.1", @@ -590,14 +591,12 @@ "node_modules/@angular-devkit/core/node_modules/jsonc-parser": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" }, "node_modules/@angular-devkit/core/node_modules/picomatch": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz", "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==", - "dev": true, "engines": { "node": ">=12" }, @@ -609,7 +608,6 @@ "version": "17.3.10", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.10.tgz", "integrity": "sha512-FHcNa1ktYRd0SKExCsNJpR75RffsyuPIV8kvBXzXnLHmXMqvl25G2te3yYJ9yYqy9OLy/58HZznZTxWRyUdHOg==", - "dev": true, "dependencies": { "@angular-devkit/core": "17.3.10", "jsonc-parser": "3.2.1", @@ -626,8 +624,7 @@ "node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" }, "node_modules/@angular/animations": { "version": "17.3.12", @@ -906,669 +903,1024 @@ "zone.js": "~0.14.0" } }, - "node_modules/@angular/forms": { - "version": "17.3.12", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.12.tgz", - "integrity": "sha512-tV6r12Q3yEUlXwpVko4E+XscunTIpPkLbaiDn/MTL3Vxi2LZnsLgHyd/i38HaHN+e/H3B0a1ToSOhV5wf3ay4Q==", + "node_modules/@angular/fire": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@angular/fire/-/fire-17.1.0.tgz", + "integrity": "sha512-G/hktuErkAoqLc21BsLL+4LPXP8xV+Wu2vl0rqLgx7hr3DinAV+xJ1EsXJpdF8WexLQdtjEyr3ATgAao50Ykxw==", + "license": "MIT", + "dependencies": { + "@angular-devkit/schematics": "^17.0.0", + "@schematics/angular": "^17.0.0", + "firebase": "^10.12.0", + "fs-extra": "^8.0.1", + "fuzzy": "^0.1.3", + "inquirer": "^8.1.1", + "inquirer-autocomplete-prompt": "^1.0.1", + "jsonc-parser": "^3.0.0", + "node-fetch": "^2.6.1", + "open": "^8.0.0", + "ora": "^5.3.0", + "rxfire": "^6.0.5", + "semver": "^7.1.3", + "triple-beam": "^1.3.0", + "tslib": "^2.3.0", + "winston": "^3.0.0" + }, + "peerDependencies": { + "@angular/common": "^17.0.0", + "@angular/core": "^17.0.0", + "@angular/platform-browser": "^17.0.0", + "@angular/platform-browser-dynamic": "^17.0.0", + "firebase-tools": "^13.0.0", + "rxjs": "~7.8.0" + }, + "peerDependenciesMeta": { + "firebase-tools": { + "optional": true + } + } + }, + "node_modules/@angular/fire/node_modules/@firebase/analytics": { + "version": "0.10.8", + "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.8.tgz", + "integrity": "sha512-CVnHcS4iRJPqtIDc411+UmFldk0ShSK3OB+D0bKD8Ck5Vro6dbK5+APZpkuWpbfdL359DIQUnAaMLE+zs/PVyA==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@firebase/component": "0.6.9", + "@firebase/installations": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, - "engines": { - "node": "^18.13.0 || >=20.9.0" + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/analytics-compat": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.14.tgz", + "integrity": "sha512-unRVY6SvRqfNFIAA/kwl4vK+lvQAL2HVcgu9zTrUtTyYDmtIt/lOuHJynBMYEgLnKm39YKBDhtqdapP2e++ASw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/analytics": "0.10.8", + "@firebase/analytics-types": "0.8.2", + "@firebase/component": "0.6.9", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, "peerDependencies": { - "@angular/common": "17.3.12", - "@angular/core": "17.3.12", - "@angular/platform-browser": "17.3.12", - "rxjs": "^6.5.3 || ^7.4.0" + "@firebase/app-compat": "0.x" } }, - "node_modules/@angular/material": { - "version": "17.3.10", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-17.3.10.tgz", - "integrity": "sha512-hHMQES0tQPH5JW33W+mpBPuM8ybsloDTqFPuRV8cboDjosAWfJhzAKF3ozICpNlUrs62La/2Wu/756GcQrxebg==", + "node_modules/@angular/fire/node_modules/@firebase/app": { + "version": "0.10.13", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.13.tgz", + "integrity": "sha512-OZiDAEK/lDB6xy/XzYAyJJkaDqmQ+BCtOEPLqFvxWKUz5JbBmej7IiiRHdtiIOD/twW7O5AxVsfaaGA/V1bNsA==", + "license": "Apache-2.0", "dependencies": { - "@material/animation": "15.0.0-canary.7f224ddd4.0", - "@material/auto-init": "15.0.0-canary.7f224ddd4.0", - "@material/banner": "15.0.0-canary.7f224ddd4.0", - "@material/base": "15.0.0-canary.7f224ddd4.0", - "@material/button": "15.0.0-canary.7f224ddd4.0", - "@material/card": "15.0.0-canary.7f224ddd4.0", - "@material/checkbox": "15.0.0-canary.7f224ddd4.0", - "@material/chips": "15.0.0-canary.7f224ddd4.0", - "@material/circular-progress": "15.0.0-canary.7f224ddd4.0", - "@material/data-table": "15.0.0-canary.7f224ddd4.0", - "@material/density": "15.0.0-canary.7f224ddd4.0", - "@material/dialog": "15.0.0-canary.7f224ddd4.0", - "@material/dom": "15.0.0-canary.7f224ddd4.0", - "@material/drawer": "15.0.0-canary.7f224ddd4.0", - "@material/elevation": "15.0.0-canary.7f224ddd4.0", - "@material/fab": "15.0.0-canary.7f224ddd4.0", - "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", - "@material/floating-label": "15.0.0-canary.7f224ddd4.0", - "@material/form-field": "15.0.0-canary.7f224ddd4.0", - "@material/icon-button": "15.0.0-canary.7f224ddd4.0", - "@material/image-list": "15.0.0-canary.7f224ddd4.0", - "@material/layout-grid": "15.0.0-canary.7f224ddd4.0", - "@material/line-ripple": "15.0.0-canary.7f224ddd4.0", - "@material/linear-progress": "15.0.0-canary.7f224ddd4.0", - "@material/list": "15.0.0-canary.7f224ddd4.0", - "@material/menu": "15.0.0-canary.7f224ddd4.0", - "@material/menu-surface": "15.0.0-canary.7f224ddd4.0", - "@material/notched-outline": "15.0.0-canary.7f224ddd4.0", - "@material/radio": "15.0.0-canary.7f224ddd4.0", - "@material/ripple": "15.0.0-canary.7f224ddd4.0", - "@material/rtl": "15.0.0-canary.7f224ddd4.0", - "@material/segmented-button": "15.0.0-canary.7f224ddd4.0", - "@material/select": "15.0.0-canary.7f224ddd4.0", - "@material/shape": "15.0.0-canary.7f224ddd4.0", - "@material/slider": "15.0.0-canary.7f224ddd4.0", - "@material/snackbar": "15.0.0-canary.7f224ddd4.0", - "@material/switch": "15.0.0-canary.7f224ddd4.0", - "@material/tab": "15.0.0-canary.7f224ddd4.0", - "@material/tab-bar": "15.0.0-canary.7f224ddd4.0", - "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0", - "@material/tab-scroller": "15.0.0-canary.7f224ddd4.0", - "@material/textfield": "15.0.0-canary.7f224ddd4.0", - "@material/theme": "15.0.0-canary.7f224ddd4.0", - "@material/tooltip": "15.0.0-canary.7f224ddd4.0", - "@material/top-app-bar": "15.0.0-canary.7f224ddd4.0", - "@material/touch-target": "15.0.0-canary.7f224ddd4.0", - "@material/typography": "15.0.0-canary.7f224ddd4.0", - "tslib": "^2.3.0" + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "idb": "7.1.1", + "tslib": "^2.1.0" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/app-check": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.8.tgz", + "integrity": "sha512-O49RGF1xj7k6BuhxGpHmqOW5hqBIAEbt2q6POW0lIywx7emYtzPDeQI+ryQpC4zbKX646SoVZ711TN1DBLNSOQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, "peerDependencies": { - "@angular/animations": "^17.0.0 || ^18.0.0", - "@angular/cdk": "17.3.10", - "@angular/common": "^17.0.0 || ^18.0.0", - "@angular/core": "^17.0.0 || ^18.0.0", - "@angular/forms": "^17.0.0 || ^18.0.0", - "@angular/platform-browser": "^17.0.0 || ^18.0.0", - "rxjs": "^6.5.3 || ^7.4.0" + "@firebase/app": "0.x" } }, - "node_modules/@angular/platform-browser": { - "version": "17.3.12", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.12.tgz", - "integrity": "sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==", + "node_modules/@angular/fire/node_modules/@firebase/app-check-compat": { + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.15.tgz", + "integrity": "sha512-zFIvIFFNqDXpOT2huorz9cwf56VT3oJYRFjSFYdSbGYEJYEaXjLJbfC79lx/zjx4Fh+yuN8pry3TtvwaevrGbg==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@firebase/app-check": "0.8.8", + "@firebase/app-check-types": "0.5.2", + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, - "engines": { - "node": "^18.13.0 || >=20.9.0" + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/app-compat": { + "version": "0.2.43", + "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.43.tgz", + "integrity": "sha512-HM96ZyIblXjAC7TzE8wIk2QhHlSvksYkQ4Ukh1GmEenzkucSNUmUX4QvoKrqeWsLEQ8hdcojABeCV8ybVyZmeg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app": "0.10.13", + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/auth": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.7.9.tgz", + "integrity": "sha512-yLD5095kVgDw965jepMyUrIgDklD6qH/BZNHeKOgvu7pchOKNjVM+zQoOVYJIKWMWOWBq8IRNVU6NXzBbozaJg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0", + "undici": "6.19.7" }, "peerDependencies": { - "@angular/animations": "17.3.12", - "@angular/common": "17.3.12", - "@angular/core": "17.3.12" + "@firebase/app": "0.x", + "@react-native-async-storage/async-storage": "^1.18.1" }, "peerDependenciesMeta": { - "@angular/animations": { + "@react-native-async-storage/async-storage": { "optional": true } } }, - "node_modules/@angular/platform-browser-dynamic": { - "version": "17.3.12", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.12.tgz", - "integrity": "sha512-DQwV7B2x/DRLRDSisngZRdLqHdYbbrqZv2Hmu4ZbnNYaWPC8qvzgE/0CvY+UkDat3nCcsfwsMnlDeB6TL7/IaA==", + "node_modules/@angular/fire/node_modules/@firebase/auth-compat": { + "version": "0.5.14", + "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.5.14.tgz", + "integrity": "sha512-2eczCSqBl1KUPJacZlFpQayvpilg3dxXLy9cSMTKtQMTQSmondUtPI47P3ikH3bQAXhzKLOE+qVxJ3/IRtu9pw==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" + "@firebase/auth": "1.7.9", + "@firebase/auth-types": "0.12.2", + "@firebase/component": "0.6.9", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0", + "undici": "6.19.7" }, "peerDependencies": { - "@angular/common": "17.3.12", - "@angular/compiler": "17.3.12", - "@angular/core": "17.3.12", - "@angular/platform-browser": "17.3.12" + "@firebase/app-compat": "0.x" } }, - "node_modules/@angular/platform-server": { - "version": "17.3.12", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz", - "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==", - "license": "MIT", + "node_modules/@angular/fire/node_modules/@firebase/component": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.9.tgz", + "integrity": "sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0", - "xhr2": "^0.2.0" - }, - "engines": { - "node": "^18.13.0 || >=20.9.0" + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/data-connect": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@firebase/data-connect/-/data-connect-0.1.0.tgz", + "integrity": "sha512-vSe5s8dY13ilhLnfY0eYRmQsdTbH7PUFZtBbqU6JVX/j8Qp9A6G5gG6//ulbX9/1JFOF1IWNOne9c8S/DOCJaQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/auth-interop-types": "0.2.3", + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, "peerDependencies": { - "@angular/animations": "17.3.12", - "@angular/common": "17.3.12", - "@angular/compiler": "17.3.12", - "@angular/core": "17.3.12", - "@angular/platform-browser": "17.3.12" + "@firebase/app": "0.x" } }, - "node_modules/@angular/router": { - "version": "17.3.12", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.12.tgz", - "integrity": "sha512-dg7PHBSW9fmPKTVzwvHEeHZPZdpnUqW/U7kj8D29HTP9ur8zZnx9QcnbplwPeYb8yYa62JMnZSEel2X4PxdYBg==", + "node_modules/@angular/fire/node_modules/@firebase/database": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.8.tgz", + "integrity": "sha512-dzXALZeBI1U5TXt6619cv0+tgEhJiwlUtQ55WNZY7vGAjv7Q1QioV969iYwt1AQQ0ovHnEW0YW9TiBfefLvErg==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.3.0" + "@firebase/app-check-interop-types": "0.3.2", + "@firebase/auth-interop-types": "0.2.3", + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "faye-websocket": "0.11.4", + "tslib": "^2.1.0" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/database-compat": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.8.tgz", + "integrity": "sha512-OpeWZoPE3sGIRPBKYnW9wLad25RaWbGyk7fFQe4xnJQKRzlynWeFBSRRAoLE2Old01WXwskUiucNqUUVlFsceg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/database": "1.0.8", + "@firebase/database-types": "1.0.5", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/database-types": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.5.tgz", + "integrity": "sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-types": "0.9.2", + "@firebase/util": "1.10.0" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/firestore": { + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.3.tgz", + "integrity": "sha512-NwVU+JPZ/3bhvNSJMCSzfcBZZg8SUGyzZ2T0EW3/bkUeefCyzMISSt/TTIfEHc8cdyXGlMqfGe3/62u9s74UEg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "@firebase/webchannel-wrapper": "1.0.1", + "@grpc/grpc-js": "~1.9.0", + "@grpc/proto-loader": "^0.7.8", + "tslib": "^2.1.0", + "undici": "6.19.7" }, "engines": { - "node": "^18.13.0 || >=20.9.0" + "node": ">=10.10.0" }, "peerDependencies": { - "@angular/common": "17.3.12", - "@angular/core": "17.3.12", - "@angular/platform-browser": "17.3.12", - "rxjs": "^6.5.3 || ^7.4.0" + "@firebase/app": "0.x" } }, - "node_modules/@angular/ssr": { - "version": "17.3.11", - "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.11.tgz", - "integrity": "sha512-8AslXZnj5bu0fJrSSoZf202HXptc+vS8hSvEIobK1+UpEVmtrk3StiBxYTdbN4Pe76r7RGRmBt40fHe+88AZoA==", - "license": "MIT", + "node_modules/@angular/fire/node_modules/@firebase/firestore-compat": { + "version": "0.3.38", + "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.38.tgz", + "integrity": "sha512-GoS0bIMMkjpLni6StSwRJarpu2+S5m346Na7gr9YZ/BZ/W3/8iHGNr9PxC+f0rNZXqS4fGRn88pICjrZEgbkqQ==", + "license": "Apache-2.0", "dependencies": { - "critters": "0.0.22", - "tslib": "^2.3.0" + "@firebase/component": "0.6.9", + "@firebase/firestore": "4.7.3", + "@firebase/firestore-types": "3.0.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, "peerDependencies": { - "@angular/common": "^17.0.0", - "@angular/core": "^17.0.0" + "@firebase/app-compat": "0.x" } }, - "node_modules/@babel/code-frame": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.9.tgz", - "integrity": "sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==", - "dev": true, + "node_modules/@angular/fire/node_modules/@firebase/functions": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.11.8.tgz", + "integrity": "sha512-Lo2rTPDn96naFIlSZKVd1yvRRqqqwiJk7cf9TZhUerwnPKgBzXy+aHE22ry+6EjCaQusUoNai6mU6p+G8QZT1g==", + "license": "Apache-2.0", "dependencies": { - "@babel/highlight": "^7.25.9", - "picocolors": "^1.0.0" + "@firebase/app-check-interop-types": "0.3.2", + "@firebase/auth-interop-types": "0.2.3", + "@firebase/component": "0.6.9", + "@firebase/messaging-interop-types": "0.2.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0", + "undici": "6.19.7" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@firebase/app": "0.x" } }, - "node_modules/@babel/compat-data": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.9.tgz", - "integrity": "sha512-yD+hEuJ/+wAJ4Ox2/rpNv5HIuPG82x3ZlQvYVn8iYCprdxzE7P1udpGF1jyjQVBU4dgznN+k2h103vxZ7NdPyw==", - "dev": true, - "engines": { - "node": ">=6.9.0" + "node_modules/@angular/fire/node_modules/@firebase/functions-compat": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.14.tgz", + "integrity": "sha512-dZ0PKOKQFnOlMfcim39XzaXonSuPPAVuzpqA4ONTIdyaJK/OnBaIEVs/+BH4faa1a2tLeR+Jy15PKqDRQoNIJw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/functions": "0.11.8", + "@firebase/functions-types": "0.6.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@babel/core": { - "version": "7.22.9", - "dev": true, - "license": "MIT", + "node_modules/@angular/fire/node_modules/@firebase/installations": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.9.tgz", + "integrity": "sha512-hlT7AwCiKghOX3XizLxXOsTFiFCQnp/oj86zp1UxwDGmyzsyoxtX+UIZyVyH/oBF5+XtblFG9KZzZQ/h+dpy+Q==", + "license": "Apache-2.0", "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" + "@firebase/component": "0.6.9", + "@firebase/util": "1.10.0", + "idb": "7.1.1", + "tslib": "^2.1.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" + "peerDependencies": { + "@firebase/app": "0.x" } }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "node_modules/@angular/fire/node_modules/@firebase/installations-compat": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.9.tgz", + "integrity": "sha512-2lfdc6kPXR7WaL4FCQSQUhXcPbI7ol3wF+vkgtU25r77OxPf8F/VmswQ7sgIkBBWtymn5ZF20TIKtnOj9rjb6w==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/installations": "0.6.9", + "@firebase/installations-types": "0.5.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@babel/generator": { - "version": "7.22.9", - "dev": true, - "license": "MIT", + "node_modules/@angular/fire/node_modules/@firebase/logger": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", + "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", + "license": "Apache-2.0", "dependencies": { - "@babel/types": "^7.22.5", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" + "tslib": "^2.1.0" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/messaging": { + "version": "0.12.12", + "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.12.tgz", + "integrity": "sha512-6q0pbzYBJhZEtUoQx7hnPhZvAbuMNuBXKQXOx2YlWhSrlv9N1m0ZzlNpBbu/ItTzrwNKTibdYzUyaaxdWLg+4w==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/installations": "0.6.9", + "@firebase/messaging-interop-types": "0.2.2", + "@firebase/util": "1.10.0", + "idb": "7.1.1", + "tslib": "^2.1.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@firebase/app": "0.x" } }, - "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", - "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", - "dev": true, + "node_modules/@angular/fire/node_modules/@firebase/messaging-compat": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.12.tgz", + "integrity": "sha512-pKsiUVZrbmRgdImYqhBNZlkKJbqjlPkVdQRZGRbkTyX4OSGKR0F/oJeCt1a8jEg5UnBp4fdVwSWSp4DuCovvEQ==", + "license": "Apache-2.0", "dependencies": { - "@babel/types": "^7.22.5" + "@firebase/component": "0.6.9", + "@firebase/messaging": "0.12.12", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz", - "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==", - "dev": true, + "node_modules/@angular/fire/node_modules/@firebase/performance": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.9.tgz", + "integrity": "sha512-PnVaak5sqfz5ivhua+HserxTJHtCar/7zM0flCX6NkzBNzJzyzlH4Hs94h2Il0LQB99roBqoE5QT1JqWqcLJHQ==", + "license": "Apache-2.0", "dependencies": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" + "@firebase/component": "0.6.9", + "@firebase/installations": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@firebase/app": "0.x" } }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", - "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", - "dev": true, + "node_modules/@angular/fire/node_modules/@firebase/performance-compat": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.9.tgz", + "integrity": "sha512-dNl95IUnpsu3fAfYBZDCVhXNkASE0uo4HYaEPd2/PKscfTvsgqFAOxfAXzBEDOnynDWiaGUnb5M1O00JQ+3FXA==", + "license": "Apache-2.0", "dependencies": { - "@babel/compat-data": "^7.25.9", - "@babel/helper-validator-option": "^7.25.9", - "browserslist": "^4.24.0", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/performance": "0.6.9", + "@firebase/performance-types": "0.2.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" + "node_modules/@angular/fire/node_modules/@firebase/remote-config": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.9.tgz", + "integrity": "sha512-EO1NLCWSPMHdDSRGwZ73kxEEcTopAxX1naqLJFNApp4hO8WfKfmEpmjxmP5TrrnypjIf2tUkYaKsfbEA7+AMmA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/installations": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" } }, - "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz", - "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==", - "dev": true, + "node_modules/@angular/fire/node_modules/@firebase/remote-config-compat": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.9.tgz", + "integrity": "sha512-AxzGpWfWFYejH2twxfdOJt5Cfh/ATHONegTd/a0p5flEzsD5JsxXgfkFToop+mypEL3gNwawxrxlZddmDoNxyA==", + "license": "Apache-2.0", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.25.9", - "@babel/helper-member-expression-to-functions": "^7.25.9", - "@babel/helper-optimise-call-expression": "^7.25.9", - "@babel/helper-replace-supers": "^7.25.9", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", - "@babel/traverse": "^7.25.9", - "semver": "^6.3.1" + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/remote-config": "0.4.9", + "@firebase/remote-config-types": "0.3.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@angular/fire/node_modules/@firebase/storage": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.13.2.tgz", + "integrity": "sha512-fxuJnHshbhVwuJ4FuISLu+/76Aby2sh+44ztjF2ppoe0TELIDxPW6/r1KGlWYt//AD0IodDYYA8ZTN89q8YqUw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0", + "undici": "6.19.7" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "@firebase/app": "0.x" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", - "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", - "dev": true, + "node_modules/@angular/fire/node_modules/@firebase/storage-compat": { + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.12.tgz", + "integrity": "sha512-hA4VWKyGU5bWOll+uwzzhEMMYGu9PlKQc1w4DWxB3aIErWYzonrZjF0icqNQZbwKNIdh8SHjZlFeB2w6OSsjfg==", + "license": "Apache-2.0", "dependencies": { - "@babel/types": "^7.25.9" + "@firebase/component": "0.6.9", + "@firebase/storage": "0.13.2", + "@firebase/storage-types": "0.8.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node_modules/@angular/fire/node_modules/@firebase/util": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz", + "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" } }, - "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz", - "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==", - "dev": true, + "node_modules/@angular/fire/node_modules/@firebase/webchannel-wrapper": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.1.tgz", + "integrity": "sha512-jmEnr/pk0yVkA7mIlHNnxCi+wWzOFUg0WyIotgkKAb2u1J7fAeDBcVNSTjTihbAYNusCLQdW5s9IJ5qwnEufcQ==", + "license": "Apache-2.0" + }, + "node_modules/@angular/fire/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.25.9", - "regexpu-core": "^6.1.1", - "semver": "^6.3.1" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=6.9.0" + "node": ">=8" }, - "peerDependencies": { - "@babel/core": "^7.0.0" + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", - "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", - "dev": true, + "node_modules/@angular/fire/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.25.9" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=6.9.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node_modules/@angular/fire/node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "license": "ISC", + "engines": { + "node": ">= 10" } }, - "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", - "dev": true, + "node_modules/@angular/fire/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-plugin-utils": "^7.22.5", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2" + "color-name": "~1.1.4" }, - "peerDependencies": { - "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "dev": true, - "license": "MIT", "engines": { - "node": ">=6.9.0" + "node": ">=7.0.0" } }, - "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz", - "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==", - "dev": true, + "node_modules/@angular/fire/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/@angular/fire/node_modules/firebase": { + "version": "10.14.1", + "resolved": "https://registry.npmjs.org/firebase/-/firebase-10.14.1.tgz", + "integrity": "sha512-0KZxU+Ela9rUCULqFsUUOYYkjh7OM1EWdIfG6///MtXd0t2/uUIf0iNV5i0KariMhRQ5jve/OY985nrAXFaZeQ==", + "license": "Apache-2.0", "dependencies": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" - }, + "@firebase/analytics": "0.10.8", + "@firebase/analytics-compat": "0.2.14", + "@firebase/app": "0.10.13", + "@firebase/app-check": "0.8.8", + "@firebase/app-check-compat": "0.3.15", + "@firebase/app-compat": "0.2.43", + "@firebase/app-types": "0.9.2", + "@firebase/auth": "1.7.9", + "@firebase/auth-compat": "0.5.14", + "@firebase/data-connect": "0.1.0", + "@firebase/database": "1.0.8", + "@firebase/database-compat": "1.0.8", + "@firebase/firestore": "4.7.3", + "@firebase/firestore-compat": "0.3.38", + "@firebase/functions": "0.11.8", + "@firebase/functions-compat": "0.3.14", + "@firebase/installations": "0.6.9", + "@firebase/installations-compat": "0.2.9", + "@firebase/messaging": "0.12.12", + "@firebase/messaging-compat": "0.2.12", + "@firebase/performance": "0.6.9", + "@firebase/performance-compat": "0.2.9", + "@firebase/remote-config": "0.4.9", + "@firebase/remote-config-compat": "0.2.9", + "@firebase/storage": "0.13.2", + "@firebase/storage-compat": "0.3.12", + "@firebase/util": "1.10.0", + "@firebase/vertexai-preview": "0.0.4" + } + }, + "node_modules/@angular/fire/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { - "node": ">=6.9.0" + "node": ">=8" } }, - "node_modules/@babel/helper-module-imports": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", - "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", - "dev": true, + "node_modules/@angular/fire/node_modules/inquirer": { + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", + "license": "MIT", "dependencies": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" }, "engines": { - "node": ">=6.9.0" + "node": ">=12.0.0" } }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.9.tgz", - "integrity": "sha512-TvLZY/F3+GvdRYFZFyxMvnsKi+4oJdgZzU3BoGN9Uc2d9C6zfNwJcKKhjqLAhK8i46mv93jsO74fDh3ih6rpHA==", - "dev": true, + "node_modules/@angular/fire/node_modules/inquirer-autocomplete-prompt": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.4.0.tgz", + "integrity": "sha512-qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw==", + "license": "ISC", "dependencies": { - "@babel/helper-module-imports": "^7.25.9", - "@babel/helper-simple-access": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9", - "@babel/traverse": "^7.25.9" + "ansi-escapes": "^4.3.1", + "chalk": "^4.0.0", + "figures": "^3.2.0", + "run-async": "^2.4.0", + "rxjs": "^6.6.2" }, "engines": { - "node": ">=6.9.0" + "node": ">=10" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "inquirer": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz", - "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==", - "dev": true, + "node_modules/@angular/fire/node_modules/inquirer-autocomplete-prompt/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "license": "Apache-2.0", "dependencies": { - "@babel/types": "^7.25.9" + "tslib": "^1.9.0" }, "engines": { - "node": ">=6.9.0" + "npm": ">=2.0.0" } }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", - "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", - "dev": true, + "node_modules/@angular/fire/node_modules/inquirer-autocomplete-prompt/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "license": "0BSD" + }, + "node_modules/@angular/fire/node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "license": "ISC" + }, + "node_modules/@angular/fire/node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "license": "MIT", "engines": { - "node": ">=6.9.0" + "node": ">=0.12.0" } }, - "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz", - "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==", - "dev": true, + "node_modules/@angular/fire/node_modules/rxfire": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/rxfire/-/rxfire-6.0.5.tgz", + "integrity": "sha512-ycBsANGbya3GNtOBKzZVATLEV+0S9gUrlTfwnN15TCXtgG8OgIMAuv2k9+kMeVaevp/DRp1KT+vYf6Wkop6gvw==", + "license": "Apache-2.0", + "peerDependencies": { + "firebase": "^9.0.0 || ^10.0.0", + "rxjs": "^6.0.0 || ^7.0.0" + } + }, + "node_modules/@angular/fire/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.25.9", - "@babel/helper-wrap-function": "^7.25.9", - "@babel/traverse": "^7.25.9" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" + "node": ">=8" } }, - "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", - "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", - "dev": true, + "node_modules/@angular/fire/node_modules/undici": { + "version": "6.19.7", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.7.tgz", + "integrity": "sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==", + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, + "node_modules/@angular/fire/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.25.9" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=6.9.0" + "node": ">=8" } }, - "node_modules/@babel/helper-replace-supers": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz", - "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==", - "dev": true, + "node_modules/@angular/forms": { + "version": "17.3.12", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.12.tgz", + "integrity": "sha512-tV6r12Q3yEUlXwpVko4E+XscunTIpPkLbaiDn/MTL3Vxi2LZnsLgHyd/i38HaHN+e/H3B0a1ToSOhV5wf3ay4Q==", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.25.9", - "@babel/helper-optimise-call-expression": "^7.25.9", - "@babel/traverse": "^7.25.9" + "tslib": "^2.3.0" }, "engines": { - "node": ">=6.9.0" + "node": "^18.13.0 || >=20.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "@angular/common": "17.3.12", + "@angular/core": "17.3.12", + "@angular/platform-browser": "17.3.12", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@babel/helper-simple-access": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz", - "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==", - "dev": true, + "node_modules/@angular/material": { + "version": "17.3.10", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-17.3.10.tgz", + "integrity": "sha512-hHMQES0tQPH5JW33W+mpBPuM8ybsloDTqFPuRV8cboDjosAWfJhzAKF3ozICpNlUrs62La/2Wu/756GcQrxebg==", "dependencies": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" + "@material/animation": "15.0.0-canary.7f224ddd4.0", + "@material/auto-init": "15.0.0-canary.7f224ddd4.0", + "@material/banner": "15.0.0-canary.7f224ddd4.0", + "@material/base": "15.0.0-canary.7f224ddd4.0", + "@material/button": "15.0.0-canary.7f224ddd4.0", + "@material/card": "15.0.0-canary.7f224ddd4.0", + "@material/checkbox": "15.0.0-canary.7f224ddd4.0", + "@material/chips": "15.0.0-canary.7f224ddd4.0", + "@material/circular-progress": "15.0.0-canary.7f224ddd4.0", + "@material/data-table": "15.0.0-canary.7f224ddd4.0", + "@material/density": "15.0.0-canary.7f224ddd4.0", + "@material/dialog": "15.0.0-canary.7f224ddd4.0", + "@material/dom": "15.0.0-canary.7f224ddd4.0", + "@material/drawer": "15.0.0-canary.7f224ddd4.0", + "@material/elevation": "15.0.0-canary.7f224ddd4.0", + "@material/fab": "15.0.0-canary.7f224ddd4.0", + "@material/feature-targeting": "15.0.0-canary.7f224ddd4.0", + "@material/floating-label": "15.0.0-canary.7f224ddd4.0", + "@material/form-field": "15.0.0-canary.7f224ddd4.0", + "@material/icon-button": "15.0.0-canary.7f224ddd4.0", + "@material/image-list": "15.0.0-canary.7f224ddd4.0", + "@material/layout-grid": "15.0.0-canary.7f224ddd4.0", + "@material/line-ripple": "15.0.0-canary.7f224ddd4.0", + "@material/linear-progress": "15.0.0-canary.7f224ddd4.0", + "@material/list": "15.0.0-canary.7f224ddd4.0", + "@material/menu": "15.0.0-canary.7f224ddd4.0", + "@material/menu-surface": "15.0.0-canary.7f224ddd4.0", + "@material/notched-outline": "15.0.0-canary.7f224ddd4.0", + "@material/radio": "15.0.0-canary.7f224ddd4.0", + "@material/ripple": "15.0.0-canary.7f224ddd4.0", + "@material/rtl": "15.0.0-canary.7f224ddd4.0", + "@material/segmented-button": "15.0.0-canary.7f224ddd4.0", + "@material/select": "15.0.0-canary.7f224ddd4.0", + "@material/shape": "15.0.0-canary.7f224ddd4.0", + "@material/slider": "15.0.0-canary.7f224ddd4.0", + "@material/snackbar": "15.0.0-canary.7f224ddd4.0", + "@material/switch": "15.0.0-canary.7f224ddd4.0", + "@material/tab": "15.0.0-canary.7f224ddd4.0", + "@material/tab-bar": "15.0.0-canary.7f224ddd4.0", + "@material/tab-indicator": "15.0.0-canary.7f224ddd4.0", + "@material/tab-scroller": "15.0.0-canary.7f224ddd4.0", + "@material/textfield": "15.0.0-canary.7f224ddd4.0", + "@material/theme": "15.0.0-canary.7f224ddd4.0", + "@material/tooltip": "15.0.0-canary.7f224ddd4.0", + "@material/top-app-bar": "15.0.0-canary.7f224ddd4.0", + "@material/touch-target": "15.0.0-canary.7f224ddd4.0", + "@material/typography": "15.0.0-canary.7f224ddd4.0", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/animations": "^17.0.0 || ^18.0.0", + "@angular/cdk": "17.3.10", + "@angular/common": "^17.0.0 || ^18.0.0", + "@angular/core": "^17.0.0 || ^18.0.0", + "@angular/forms": "^17.0.0 || ^18.0.0", + "@angular/platform-browser": "^17.0.0 || ^18.0.0", + "rxjs": "^6.5.3 || ^7.4.0" + } + }, + "node_modules/@angular/platform-browser": { + "version": "17.3.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.12.tgz", + "integrity": "sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==", + "dependencies": { + "tslib": "^2.3.0" }, "engines": { - "node": ">=6.9.0" + "node": "^18.13.0 || >=20.9.0" + }, + "peerDependencies": { + "@angular/animations": "17.3.12", + "@angular/common": "17.3.12", + "@angular/core": "17.3.12" + }, + "peerDependenciesMeta": { + "@angular/animations": { + "optional": true + } } }, - "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz", - "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==", - "dev": true, + "node_modules/@angular/platform-browser-dynamic": { + "version": "17.3.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.12.tgz", + "integrity": "sha512-DQwV7B2x/DRLRDSisngZRdLqHdYbbrqZv2Hmu4ZbnNYaWPC8qvzgE/0CvY+UkDat3nCcsfwsMnlDeB6TL7/IaA==", "dependencies": { - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" + "tslib": "^2.3.0" }, "engines": { - "node": ">=6.9.0" + "node": "^18.13.0 || >=20.9.0" + }, + "peerDependencies": { + "@angular/common": "17.3.12", + "@angular/compiler": "17.3.12", + "@angular/core": "17.3.12", + "@angular/platform-browser": "17.3.12" } }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "dev": true, + "node_modules/@angular/platform-server": { + "version": "17.3.12", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz", + "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==", "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "tslib": "^2.3.0", + "xhr2": "^0.2.0" }, "engines": { - "node": ">=6.9.0" + "node": "^18.13.0 || >=20.9.0" + }, + "peerDependencies": { + "@angular/animations": "17.3.12", + "@angular/common": "17.3.12", + "@angular/compiler": "17.3.12", + "@angular/core": "17.3.12", + "@angular/platform-browser": "17.3.12" } }, - "node_modules/@babel/helper-string-parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", - "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", - "dev": true, + "node_modules/@angular/router": { + "version": "17.3.12", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.12.tgz", + "integrity": "sha512-dg7PHBSW9fmPKTVzwvHEeHZPZdpnUqW/U7kj8D29HTP9ur8zZnx9QcnbplwPeYb8yYa62JMnZSEel2X4PxdYBg==", + "dependencies": { + "tslib": "^2.3.0" + }, "engines": { - "node": ">=6.9.0" + "node": "^18.13.0 || >=20.9.0" + }, + "peerDependencies": { + "@angular/common": "17.3.12", + "@angular/core": "17.3.12", + "@angular/platform-browser": "17.3.12", + "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@babel/helper-validator-identifier": { + "node_modules/@angular/ssr": { + "version": "17.3.11", + "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.11.tgz", + "integrity": "sha512-8AslXZnj5bu0fJrSSoZf202HXptc+vS8hSvEIobK1+UpEVmtrk3StiBxYTdbN4Pe76r7RGRmBt40fHe+88AZoA==", + "license": "MIT", + "dependencies": { + "critters": "0.0.22", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": "^17.0.0", + "@angular/core": "^17.0.0" + } + }, + "node_modules/@babel/code-frame": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", - "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.9.tgz", + "integrity": "sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==", "dev": true, + "dependencies": { + "@babel/highlight": "^7.25.9", + "picocolors": "^1.0.0" + }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-validator-option": { + "node_modules/@babel/compat-data": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", - "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.9.tgz", + "integrity": "sha512-yD+hEuJ/+wAJ4Ox2/rpNv5HIuPG82x3ZlQvYVn8iYCprdxzE7P1udpGF1jyjQVBU4dgznN+k2h103vxZ7NdPyw==", "dev": true, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helper-wrap-function": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz", - "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==", + "node_modules/@babel/core": { + "version": "7.22.9", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.25.9", - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.25.9" + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.8", + "@babel/types": "^7.22.5", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.2", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/generator": { + "version": "7.22.9", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/types": "^7.22.5", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helpers": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.9.tgz", - "integrity": "sha512-oKWp3+usOJSzDZOucZUAMayhPz/xVjzymyDzUN8dk0Wd3RWMlGLXi07UCQ/CgQVb8LvXx3XBajJH4XGgkt7H7g==", + "node_modules/@babel/helper-annotate-as-pure": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, "dependencies": { - "@babel/template": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/template": { + "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz", + "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", + "@babel/traverse": "^7.25.9", "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight": { + "node_modules/@babel/helper-compilation-targets": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz", - "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.25.9", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.9.tgz", - "integrity": "sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg==", + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", "dev": true, - "dependencies": { - "@babel/types": "^7.25.9" - }, + "license": "ISC", "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" + "semver": "bin/semver.js" } }, - "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { + "node_modules/@babel/helper-create-class-features-plugin": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz", - "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz", + "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/traverse": "^7.25.9", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -1577,31 +1929,36 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { + "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz", - "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", - "@babel/plugin-transform-optional-chaining": "^7.25.9" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.13.0" } }, - "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { + "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-create-regexp-features-plugin": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz", - "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz", + "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/traverse": "^7.25.9" + "@babel/helper-annotate-as-pure": "^7.25.9", + "regexpu-core": "^6.1.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -1610,406 +1967,364 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.0-placeholder-for-preset-env.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", - "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, + "dependencies": { + "@babel/types": "^7.25.9" + }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "node_modules/@babel/helper-define-polyfill-provider": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", + "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "node_modules/@babel/helper-environment-visitor": { + "version": "7.22.20", "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, + "license": "MIT", "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "node_modules/@babel/helper-member-expression-to-functions": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz", + "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", + "node_modules/@babel/helper-module-imports": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-syntax-import-assertions": { + "node_modules/@babel/helper-module-transforms": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.9.tgz", - "integrity": "sha512-4GHX5uzr5QMOOuzV0an9MFju4hKlm0OyePl/lHhcsTVae5t/IKVHnb8W67Vr6FuLlk5lPqLB7n7O+K5R46emYg==", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.9.tgz", + "integrity": "sha512-TvLZY/F3+GvdRYFZFyxMvnsKi+4oJdgZzU3BoGN9Uc2d9C6zfNwJcKKhjqLAhK8i46mv93jsO74fDh3ih6rpHA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-simple-access": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-syntax-import-attributes": { + "node_modules/@babel/helper-optimise-call-expression": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.9.tgz", - "integrity": "sha512-u3EN9ub8LyYvgTnrgp8gboElouayiwPdnM7x5tcnW3iSt09/lQYPwMNK40I9IUxo7QOZhAsPHCmmuO7EPdruqg==", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz", + "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "node_modules/@babel/helper-plugin-utils": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", + "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "node_modules/@babel/helper-remap-async-to-generator": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz", + "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-wrap-function": "^7.25.9", + "@babel/traverse": "^7.25.9" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/types": "^7.25.9" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "node_modules/@babel/helper-replace-supers": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz", + "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-member-expression-to-functions": "^7.25.9", + "@babel/helper-optimise-call-expression": "^7.25.9", + "@babel/traverse": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "node_modules/@babel/helper-simple-access": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz", + "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz", + "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.22.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/types": "^7.22.5" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.14.5" - }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-unicode-sets-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", - "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", + "node_modules/@babel/helper-validator-option": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, - "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-transform-arrow-functions": { + "node_modules/@babel/helper-wrap-function": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz", - "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz", + "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz", - "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==", + "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.20", - "@babel/plugin-syntax-async-generators": "^7.8.4" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz", - "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==", + "node_modules/@babel/helpers": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.9.tgz", + "integrity": "sha512-oKWp3+usOJSzDZOucZUAMayhPz/xVjzymyDzUN8dk0Wd3RWMlGLXi07UCQ/CgQVb8LvXx3XBajJH4XGgkt7H7g==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.20" + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-block-scoped-functions": { + "node_modules/@babel/helpers/node_modules/@babel/template": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz", - "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-block-scoping": { + "node_modules/@babel/highlight": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz", - "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz", + "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-validator-identifier": "^7.25.9", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-class-properties": { + "node_modules/@babel/parser": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz", - "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.9.tgz", + "integrity": "sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/types": "^7.25.9" }, - "engines": { - "node": ">=6.9.0" + "bin": { + "parser": "bin/babel-parser.js" }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" + "engines": { + "node": ">=6.0.0" } }, - "node_modules/@babel/plugin-transform-class-static-block": { + "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.9.tgz", - "integrity": "sha512-UIf+72C7YJ+PJ685/PpATbCz00XqiFEzHX5iysRwfvNT0Ko+FaXSvRgLytFSp8xUItrG9pFM/KoBBZDrY/cYyg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz", + "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.12.0" + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-transform-classes": { + "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz", - "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.25.9", - "@babel/helper-compilation-targets": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9", - "@babel/helper-replace-supers": "^7.25.9", - "@babel/traverse": "^7.25.9", - "globals": "^11.1.0" + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9", + "@babel/plugin-transform-optional-chaining": "^7.25.9" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.13.0" } }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": { + "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", - "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz", + "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==", "dev": true, "dependencies": { - "@babel/types": "^7.25.9" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz", - "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==", + "node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/template": "^7.25.9" - }, "engines": { "node": ">=6.9.0" }, @@ -2017,43 +2332,37 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/helper-plugin-utils": "^7.8.0" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", - "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.12.13" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz", - "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==", + "node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { "node": ">=6.9.0" @@ -2062,43 +2371,36 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz", - "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==", + "node_modules/@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz", - "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==", + "node_modules/@babel/plugin-syntax-export-namespace-from": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", + "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.3" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-exponentiation-operator": { + "node_modules/@babel/plugin-syntax-import-assertions": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz", - "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.9.tgz", + "integrity": "sha512-4GHX5uzr5QMOOuzV0an9MFju4hKlm0OyePl/lHhcsTVae5t/IKVHnb8W67Vr6FuLlk5lPqLB7n7O+K5R46emYg==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { @@ -2108,10 +2410,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-export-namespace-from": { + "node_modules/@babel/plugin-syntax-import-attributes": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz", - "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.9.tgz", + "integrity": "sha512-u3EN9ub8LyYvgTnrgp8gboElouayiwPdnM7x5tcnW3iSt09/lQYPwMNK40I9IUxo7QOZhAsPHCmmuO7EPdruqg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2123,142 +2425,109 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-for-of": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz", - "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==", + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.10.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-function-name": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz", - "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==", + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/traverse": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz", - "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==", + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.10.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-literals": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz", - "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==", + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz", - "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==", + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.10.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz", - "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==", + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz", - "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==", + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz", - "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==", + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/helper-simple-access": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz", - "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==", + "node_modules/@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9", - "@babel/traverse": "^7.25.9" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { "node": ">=6.9.0" @@ -2267,14 +2536,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz", - "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==", + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { "node": ">=6.9.0" @@ -2283,14 +2551,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz", - "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==", + "node_modules/@babel/plugin-syntax-unicode-sets-regex": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", + "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -2299,10 +2567,10 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-transform-new-target": { + "node_modules/@babel/plugin-transform-arrow-functions": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz", - "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz", + "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2314,13 +2582,16 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz", - "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==", + "node_modules/@babel/plugin-transform-async-generator-functions": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz", + "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20", + "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { "node": ">=6.9.0" @@ -2329,13 +2600,15 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz", - "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==", + "node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz", + "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2344,15 +2617,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-object-rest-spread": { + "node_modules/@babel/plugin-transform-block-scoped-functions": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz", - "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz", + "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/plugin-transform-parameters": "^7.25.9" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2361,14 +2632,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-object-super": { + "node_modules/@babel/plugin-transform-block-scoping": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz", - "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz", + "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/helper-replace-supers": "^7.25.9" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2377,12 +2647,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-optional-catch-binding": { + "node_modules/@babel/plugin-transform-class-properties": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz", - "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz", + "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==", "dev": true, "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { @@ -2392,29 +2663,34 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-optional-chaining": { + "node_modules/@babel/plugin-transform-class-static-block": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz", - "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.9.tgz", + "integrity": "sha512-UIf+72C7YJ+PJ685/PpATbCz00XqiFEzHX5iysRwfvNT0Ko+FaXSvRgLytFSp8xUItrG9pFM/KoBBZDrY/cYyg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.12.0" } }, - "node_modules/@babel/plugin-transform-parameters": { + "node_modules/@babel/plugin-transform-classes": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", - "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz", + "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9", + "@babel/traverse": "^7.25.9", + "globals": "^11.1.0" }, "engines": { "node": ">=6.9.0" @@ -2423,31 +2699,26 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-private-methods": { + "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz", - "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-private-property-in-object": { + "node_modules/@babel/plugin-transform-computed-properties": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz", - "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz", + "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.25.9", - "@babel/helper-create-class-features-plugin": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/template": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2456,22 +2727,24 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": { + "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", - "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, "dependencies": { + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/plugin-transform-property-literals": { + "node_modules/@babel/plugin-transform-destructuring": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz", - "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz", + "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2483,14 +2756,14 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-regenerator": { + "node_modules/@babel/plugin-transform-dotall-regex": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz", - "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz", + "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9", - "regenerator-transform": "^0.15.2" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2499,10 +2772,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-reserved-words": { + "node_modules/@babel/plugin-transform-duplicate-keys": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz", - "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz", + "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2514,18 +2787,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-runtime": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz", - "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==", + "node_modules/@babel/plugin-transform-dynamic-import": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz", + "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-plugin-utils": "^7.24.0", - "babel-plugin-polyfill-corejs2": "^0.4.8", - "babel-plugin-polyfill-corejs3": "^0.9.0", - "babel-plugin-polyfill-regenerator": "^0.5.5", - "semver": "^6.3.1" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2534,19 +2802,26 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "node_modules/@babel/plugin-transform-exponentiation-operator": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz", + "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-shorthand-properties": { + "node_modules/@babel/plugin-transform-export-namespace-from": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", - "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz", + "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2558,10 +2833,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-spread": { + "node_modules/@babel/plugin-transform-for-of": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz", - "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz", + "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9", @@ -2574,13 +2849,15 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-sticky-regex": { + "node_modules/@babel/plugin-transform-function-name": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz", - "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz", + "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2589,10 +2866,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-template-literals": { + "node_modules/@babel/plugin-transform-json-strings": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz", - "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz", + "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2604,10 +2881,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-typeof-symbol": { + "node_modules/@babel/plugin-transform-literals": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz", - "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz", + "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2619,10 +2896,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-unicode-escapes": { + "node_modules/@babel/plugin-transform-logical-assignment-operators": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz", - "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz", + "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.25.9" @@ -2634,13 +2911,12 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-unicode-property-regex": { + "node_modules/@babel/plugin-transform-member-expression-literals": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz", - "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz", + "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { @@ -2650,13 +2926,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-unicode-regex": { + "node_modules/@babel/plugin-transform-modules-amd": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz", - "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz", + "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-module-transforms": "^7.25.9", "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { @@ -2666,108 +2942,33 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-unicode-sets-regex": { + "node_modules/@babel/plugin-transform-modules-commonjs": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz", - "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz", + "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.25.9", - "@babel/helper-plugin-utils": "^7.25.9" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-simple-access": "^7.25.9" }, "engines": { "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0" + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-env": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz", - "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==", + "node_modules/@babel/plugin-transform-modules-systemjs": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz", + "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.23.5", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-plugin-utils": "^7.24.0", - "@babel/helper-validator-option": "^7.23.5", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7", - "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.14.5", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.23.3", - "@babel/plugin-syntax-import-attributes": "^7.23.3", - "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5", - "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.23.3", - "@babel/plugin-transform-async-generator-functions": "^7.23.9", - "@babel/plugin-transform-async-to-generator": "^7.23.3", - "@babel/plugin-transform-block-scoped-functions": "^7.23.3", - "@babel/plugin-transform-block-scoping": "^7.23.4", - "@babel/plugin-transform-class-properties": "^7.23.3", - "@babel/plugin-transform-class-static-block": "^7.23.4", - "@babel/plugin-transform-classes": "^7.23.8", - "@babel/plugin-transform-computed-properties": "^7.23.3", - "@babel/plugin-transform-destructuring": "^7.23.3", - "@babel/plugin-transform-dotall-regex": "^7.23.3", - "@babel/plugin-transform-duplicate-keys": "^7.23.3", - "@babel/plugin-transform-dynamic-import": "^7.23.4", - "@babel/plugin-transform-exponentiation-operator": "^7.23.3", - "@babel/plugin-transform-export-namespace-from": "^7.23.4", - "@babel/plugin-transform-for-of": "^7.23.6", - "@babel/plugin-transform-function-name": "^7.23.3", - "@babel/plugin-transform-json-strings": "^7.23.4", - "@babel/plugin-transform-literals": "^7.23.3", - "@babel/plugin-transform-logical-assignment-operators": "^7.23.4", - "@babel/plugin-transform-member-expression-literals": "^7.23.3", - "@babel/plugin-transform-modules-amd": "^7.23.3", - "@babel/plugin-transform-modules-commonjs": "^7.23.3", - "@babel/plugin-transform-modules-systemjs": "^7.23.9", - "@babel/plugin-transform-modules-umd": "^7.23.3", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", - "@babel/plugin-transform-new-target": "^7.23.3", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", - "@babel/plugin-transform-numeric-separator": "^7.23.4", - "@babel/plugin-transform-object-rest-spread": "^7.24.0", - "@babel/plugin-transform-object-super": "^7.23.3", - "@babel/plugin-transform-optional-catch-binding": "^7.23.4", - "@babel/plugin-transform-optional-chaining": "^7.23.4", - "@babel/plugin-transform-parameters": "^7.23.3", - "@babel/plugin-transform-private-methods": "^7.23.3", - "@babel/plugin-transform-private-property-in-object": "^7.23.4", - "@babel/plugin-transform-property-literals": "^7.23.3", - "@babel/plugin-transform-regenerator": "^7.23.3", - "@babel/plugin-transform-reserved-words": "^7.23.3", - "@babel/plugin-transform-shorthand-properties": "^7.23.3", - "@babel/plugin-transform-spread": "^7.23.3", - "@babel/plugin-transform-sticky-regex": "^7.23.3", - "@babel/plugin-transform-template-literals": "^7.23.3", - "@babel/plugin-transform-typeof-symbol": "^7.23.3", - "@babel/plugin-transform-unicode-escapes": "^7.23.3", - "@babel/plugin-transform-unicode-property-regex": "^7.23.3", - "@babel/plugin-transform-unicode-regex": "^7.23.3", - "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", - "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.8", - "babel-plugin-polyfill-corejs3": "^0.9.0", - "babel-plugin-polyfill-regenerator": "^0.5.5", - "core-js-compat": "^3.31.0", - "semver": "^6.3.1" + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -2776,601 +2977,1806 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "node_modules/@babel/plugin-transform-modules-umd": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz", + "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "@babel/helper-module-transforms": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-modules": { - "version": "0.1.6-no-external-plugins", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", - "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", + "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz", + "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { - "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" + "@babel/core": "^7.0.0" } }, - "node_modules/@babel/runtime": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", - "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", + "node_modules/@babel/plugin-transform-new-target": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz", + "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==", + "dev": true, "dependencies": { - "regenerator-runtime": "^0.14.0" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/template": { - "version": "7.22.5", + "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz", + "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/traverse": { + "node_modules/@babel/plugin-transform-numeric-separator": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", - "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz", + "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/generator": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/template": "^7.25.9", - "@babel/types": "^7.25.9", - "debug": "^4.3.1", - "globals": "^11.1.0" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/traverse/node_modules/@babel/generator": { + "node_modules/@babel/plugin-transform-object-rest-spread": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.9.tgz", - "integrity": "sha512-omlUGkr5EaoIJrhLf9CJ0TvjBRpd9+AXRG//0GEQ9THSo8wPiTlbpy1/Ow8ZTrbXpjd9FHXfbFQx32I04ht0FA==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz", + "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==", "dev": true, "dependencies": { - "@babel/types": "^7.25.9", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^3.0.2" + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/plugin-transform-parameters": "^7.25.9" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/traverse/node_modules/@babel/template": { + "node_modules/@babel/plugin-transform-object-super": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz", + "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-replace-supers": "^7.25.9" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/traverse/node_modules/jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "node_modules/@babel/plugin-transform-optional-catch-binding": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz", + "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==", "dev": true, - "bin": { - "jsesc": "bin/jsesc" + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { - "node": ">=6" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/types": { + "node_modules/@babel/plugin-transform-optional-chaining": { "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.9.tgz", - "integrity": "sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz", + "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@colors/colors": { - "version": "1.5.0", + "node_modules/@babel/plugin-transform-parameters": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz", + "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==", "dev": true, - "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, "engines": { - "node": ">=0.1.90" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "node_modules/@babel/plugin-transform-private-methods": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz", + "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { - "node": ">=12" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "node_modules/@babel/plugin-transform-private-property-in-object": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz", + "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@babel/helper-annotate-as-pure": "^7.25.9", + "@babel/helper-create-class-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@cypress/request": { - "version": "3.0.1", + "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, - "license": "Apache-2.0", "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "http-signature": "~1.3.6", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "performance-now": "^2.1.0", - "qs": "6.10.4", - "safe-buffer": "^5.1.2", - "tough-cookie": "^4.1.3", - "tunnel-agent": "^0.6.0", - "uuid": "^8.3.2" + "@babel/types": "^7.25.9" }, "engines": { - "node": ">= 6" + "node": ">=6.9.0" } }, - "node_modules/@cypress/request/node_modules/form-data": { - "version": "2.3.3", + "node_modules/@babel/plugin-transform-property-literals": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz", + "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==", "dev": true, - "license": "MIT", "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { - "node": ">= 0.12" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@cypress/request/node_modules/qs": { - "version": "6.10.4", + "node_modules/@babel/plugin-transform-regenerator": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz", + "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "@babel/helper-plugin-utils": "^7.25.9", + "regenerator-transform": "^0.15.2" }, "engines": { - "node": ">=0.6" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@cypress/xvfb": { - "version": "1.2.4", + "node_modules/@babel/plugin-transform-reserved-words": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz", + "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==", "dev": true, - "license": "MIT", "dependencies": { - "debug": "^3.1.0", - "lodash.once": "^4.1.1" + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@cypress/xvfb/node_modules/debug": { - "version": "3.2.7", + "node_modules/@babel/plugin-transform-runtime": { + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz", + "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==", "dev": true, - "license": "MIT", "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/@discoveryjs/json-ext": { - "version": "0.5.7", - "dev": true, - "license": "MIT", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.24.0", + "babel-plugin-polyfill-corejs2": "^0.4.8", + "babel-plugin-polyfill-corejs3": "^0.9.0", + "babel-plugin-polyfill-regenerator": "^0.5.5", + "semver": "^6.3.1" + }, "engines": { - "node": ">=10.0.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz", - "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==", - "cpu": [ - "ppc64" - ], + "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz", - "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==", - "cpu": [ - "arm" - ], + "node_modules/@babel/plugin-transform-shorthand-properties": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz", + "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==", "dev": true, - "optional": true, - "os": [ - "android" - ], + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, "engines": { - "node": ">=12" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@esbuild/android-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz", - "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==", - "cpu": [ - "arm64" - ], + "node_modules/@babel/plugin-transform-spread": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz", + "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==", "dev": true, - "optional": true, - "os": [ - "android" - ], + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9" + }, "engines": { - "node": ">=12" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@esbuild/android-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz", - "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==", - "cpu": [ - "x64" - ], + "node_modules/@babel/plugin-transform-sticky-regex": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz", + "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==", "dev": true, - "optional": true, - "os": [ - "android" - ], + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, "engines": { - "node": ">=12" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz", - "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==", - "cpu": [ - "arm64" - ], + "node_modules/@babel/plugin-transform-template-literals": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz", + "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==", "dev": true, - "optional": true, - "os": [ - "darwin" - ], + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, "engines": { - "node": ">=12" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz", - "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==", - "cpu": [ - "x64" - ], + "node_modules/@babel/plugin-transform-typeof-symbol": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz", + "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==", "dev": true, - "optional": true, - "os": [ - "darwin" - ], + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, "engines": { - "node": ">=12" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.1", + "node_modules/@babel/plugin-transform-unicode-escapes": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz", + "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-property-regex": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz", + "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-regex": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz", + "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-sets-regex": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz", + "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.25.9", + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/preset-env": { + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz", + "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.23.5", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-validator-option": "^7.23.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", + "@babel/plugin-syntax-import-assertions": "^7.23.3", + "@babel/plugin-syntax-import-attributes": "^7.23.3", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", + "@babel/plugin-transform-arrow-functions": "^7.23.3", + "@babel/plugin-transform-async-generator-functions": "^7.23.9", + "@babel/plugin-transform-async-to-generator": "^7.23.3", + "@babel/plugin-transform-block-scoped-functions": "^7.23.3", + "@babel/plugin-transform-block-scoping": "^7.23.4", + "@babel/plugin-transform-class-properties": "^7.23.3", + "@babel/plugin-transform-class-static-block": "^7.23.4", + "@babel/plugin-transform-classes": "^7.23.8", + "@babel/plugin-transform-computed-properties": "^7.23.3", + "@babel/plugin-transform-destructuring": "^7.23.3", + "@babel/plugin-transform-dotall-regex": "^7.23.3", + "@babel/plugin-transform-duplicate-keys": "^7.23.3", + "@babel/plugin-transform-dynamic-import": "^7.23.4", + "@babel/plugin-transform-exponentiation-operator": "^7.23.3", + "@babel/plugin-transform-export-namespace-from": "^7.23.4", + "@babel/plugin-transform-for-of": "^7.23.6", + "@babel/plugin-transform-function-name": "^7.23.3", + "@babel/plugin-transform-json-strings": "^7.23.4", + "@babel/plugin-transform-literals": "^7.23.3", + "@babel/plugin-transform-logical-assignment-operators": "^7.23.4", + "@babel/plugin-transform-member-expression-literals": "^7.23.3", + "@babel/plugin-transform-modules-amd": "^7.23.3", + "@babel/plugin-transform-modules-commonjs": "^7.23.3", + "@babel/plugin-transform-modules-systemjs": "^7.23.9", + "@babel/plugin-transform-modules-umd": "^7.23.3", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.23.3", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", + "@babel/plugin-transform-numeric-separator": "^7.23.4", + "@babel/plugin-transform-object-rest-spread": "^7.24.0", + "@babel/plugin-transform-object-super": "^7.23.3", + "@babel/plugin-transform-optional-catch-binding": "^7.23.4", + "@babel/plugin-transform-optional-chaining": "^7.23.4", + "@babel/plugin-transform-parameters": "^7.23.3", + "@babel/plugin-transform-private-methods": "^7.23.3", + "@babel/plugin-transform-private-property-in-object": "^7.23.4", + "@babel/plugin-transform-property-literals": "^7.23.3", + "@babel/plugin-transform-regenerator": "^7.23.3", + "@babel/plugin-transform-reserved-words": "^7.23.3", + "@babel/plugin-transform-shorthand-properties": "^7.23.3", + "@babel/plugin-transform-spread": "^7.23.3", + "@babel/plugin-transform-sticky-regex": "^7.23.3", + "@babel/plugin-transform-template-literals": "^7.23.3", + "@babel/plugin-transform-typeof-symbol": "^7.23.3", + "@babel/plugin-transform-unicode-escapes": "^7.23.3", + "@babel/plugin-transform-unicode-property-regex": "^7.23.3", + "@babel/plugin-transform-unicode-regex": "^7.23.3", + "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", + "@babel/preset-modules": "0.1.6-no-external-plugins", + "babel-plugin-polyfill-corejs2": "^0.4.8", + "babel-plugin-polyfill-corejs3": "^0.9.0", + "babel-plugin-polyfill-regenerator": "^0.5.5", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/preset-env/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/preset-modules": { + "version": "0.1.6-no-external-plugins", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", + "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", + "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template": { + "version": "7.22.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/generator": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.9.tgz", + "integrity": "sha512-omlUGkr5EaoIJrhLf9CJ0TvjBRpd9+AXRG//0GEQ9THSo8wPiTlbpy1/Ow8ZTrbXpjd9FHXfbFQx32I04ht0FA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.25.9", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/template": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/jsesc": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@babel/types": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.9.tgz", + "integrity": "sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@cypress/request": { + "version": "3.0.1", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "http-signature": "~1.3.6", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "performance-now": "^2.1.0", + "qs": "6.10.4", + "safe-buffer": "^5.1.2", + "tough-cookie": "^4.1.3", + "tunnel-agent": "^0.6.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@cypress/request/node_modules/form-data": { + "version": "2.3.3", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/@cypress/request/node_modules/qs": { + "version": "6.10.4", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@cypress/xvfb": { + "version": "1.2.4", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.1.0", + "lodash.once": "^4.1.1" + } + }, + "node_modules/@cypress/xvfb/node_modules/debug": { + "version": "3.2.7", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/@dabh/diagnostics": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", + "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "license": "MIT", + "dependencies": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.7", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz", + "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz", + "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz", + "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz", + "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz", + "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz", + "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.20.1", "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz", "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==", "cpu": [ - "arm64" + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz", + "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz", + "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz", + "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz", + "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz", + "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz", + "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz", + "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz", + "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz", + "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", + "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz", + "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz", + "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz", + "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==", + "cpu": [ + "x64" ], "dev": true, "optional": true, "os": [ - "freebsd" + "sunos" ], "engines": { "node": ">=12" } }, - "node_modules/@esbuild/freebsd-x64": { + "node_modules/@esbuild/win32-arm64": { "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz", - "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz", + "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==", "cpu": [ - "x64" + "arm64" ], "dev": true, "optional": true, "os": [ - "freebsd" + "win32" ], "engines": { "node": ">=12" } }, - "node_modules/@esbuild/linux-arm": { + "node_modules/@esbuild/win32-ia32": { "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz", - "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz", + "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==", "cpu": [ - "arm" + "ia32" ], "dev": true, "optional": true, "os": [ - "linux" + "win32" ], "engines": { "node": ">=12" } }, - "node_modules/@esbuild/linux-arm64": { + "node_modules/@esbuild/win32-x64": { "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz", - "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz", + "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==", "cpu": [ - "arm64" + "x64" ], "dev": true, "optional": true, "os": [ - "linux" + "win32" ], "engines": { "node": ">=12" } }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz", - "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" + "node_modules/@firebase/analytics": { + "version": "0.10.9", + "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.9.tgz", + "integrity": "sha512-FrvW6u6xDBKXUGYUy1WIUh0J9tvbppMsk90mig0JhHST8iLveKu/dIBVeVE/ZYZhmXy4fkI7SPSWvD1V0O4tXw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/installations": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/analytics-compat": { + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.15.tgz", + "integrity": "sha512-C5to422Sr8FkL0MPwXcIecbMnF4o2Ll7MtoWvIm4Q/LPJvvM+tWa1DiU+LzsCdsd1/CYE9EIW9Ma3ko9XnAAYw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/analytics": "0.10.9", + "@firebase/analytics-types": "0.8.2", + "@firebase/component": "0.6.10", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/analytics-types": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.8.2.tgz", + "integrity": "sha512-EnzNNLh+9/sJsimsA/FGqzakmrAUKLeJvjRHlg8df1f97NLUlFidk9600y0ZgWOp3CAxn6Hjtk+08tixlUOWyw==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/app": { + "version": "0.10.15", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.15.tgz", + "integrity": "sha512-he6qlG3pmwL+LHdG/BrSMBQeJzzutciq4fpXN3lGa1uSwYSijJ24VtakS/bP2X9SiDf8jGywJ4u+OgXAenJsNg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "idb": "7.1.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@firebase/app-check": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.9.tgz", + "integrity": "sha512-YzVn1mMLzD2JboMPVVO0Pe20YOgWzrF+aXoAmmd0v3xec051n83YpxSUZbacL69uYvk0dHrEsbea44QtQ5WPDA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/app-check-compat": { + "version": "0.3.16", + "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.16.tgz", + "integrity": "sha512-AxIGzLRXrTFNL+H6V+4BO0w/gERloROfRbWI/FoJUnQd0qPZIzyfdHZBbThFzFGLfDt/mVs2kdjYFx/l9I8NhQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check": "0.8.9", + "@firebase/app-check-types": "0.5.2", + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/app-check-interop-types": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.2.tgz", + "integrity": "sha512-LMs47Vinv2HBMZi49C09dJxp0QT5LwDzFaVGf/+ITHe3BlIhUiLNttkATSXplc89A2lAaeTqjgqVkiRfUGyQiQ==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/app-check-types": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.5.2.tgz", + "integrity": "sha512-FSOEzTzL5bLUbD2co3Zut46iyPWML6xc4x+78TeaXMSuJap5QObfb+rVvZJtla3asN4RwU7elaQaduP+HFizDA==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/app-compat": { + "version": "0.2.45", + "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.45.tgz", + "integrity": "sha512-5rYbXq1ndtMTg+07oH4WrkYuP+NZq61uzVwW1hlmybp/gr4cXq2SfaP9fc6/9IzTKmu3dh3H0fjj++HG7Z7o/w==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app": "0.10.15", + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@firebase/app-types": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.2.tgz", + "integrity": "sha512-oMEZ1TDlBz479lmABwWsWjzHwheQKiAgnuKxE0pz0IXCVx7/rtlkx1fQ6GfgK24WCrxDKMplZrT50Kh04iMbXQ==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/auth": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.8.0.tgz", + "integrity": "sha512-/O7UDWE5S5ux456fzNHSLx/0YN/Kykw/WyAzgDQ6wvkddZhSEmPX19EzxgsFldzhuFjsl5uOZTz8kzlosCiJjg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x", + "@react-native-async-storage/async-storage": "^1.18.1" + }, + "peerDependenciesMeta": { + "@react-native-async-storage/async-storage": { + "optional": true + } + } + }, + "node_modules/@firebase/auth-compat": { + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.5.15.tgz", + "integrity": "sha512-jz6k1ridPiecKI8CBRiqCM6IMOhwYp2MD+YvoxnMiK8nQLSTm57GvHETlPNX3WlbyQnCjMCOvrAhe27whyxAEg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/auth": "1.8.0", + "@firebase/auth-types": "0.12.2", + "@firebase/component": "0.6.10", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/auth-interop-types": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.3.tgz", + "integrity": "sha512-Fc9wuJGgxoxQeavybiuwgyi+0rssr76b+nHpj+eGhXFYAdudMWyfBHvFL/I5fEHniUM/UQdFzi9VXJK2iZF7FQ==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/auth-types": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.12.2.tgz", + "integrity": "sha512-qsEBaRMoGvHO10unlDJhaKSuPn4pyoTtlQuP1ghZfzB6rNQPuhp/N/DcFZxm9i4v0SogjCbf9reWupwIvfmH6w==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/component": { + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.10.tgz", + "integrity": "sha512-OsNbEKyz9iLZSmMUhsl6+kCADzte00iisJIRUspnUqvDCX+RSGZOBIqekukv/jN177ovjApBQNFaxSYIDc/SyQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@firebase/data-connect": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@firebase/data-connect/-/data-connect-0.1.1.tgz", + "integrity": "sha512-RBJ7XE/a3oXFv31Jlw8cbMRdsxQoI8F3L7xm4n93ab+bIr1NQUiYGgW9L7TTw7obdNev91ZnW0xfqJtXcPA5yA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/auth-interop-types": "0.2.3", + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/database": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.9.tgz", + "integrity": "sha512-EkiPSKSu2TJJGtOjyISASf3UFpFJDil1lMbfqnxilfbmIsilvC8DzgjuLoYD+eOitcug4wtU9Fh1tt2vgBhskA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.2", + "@firebase/auth-interop-types": "0.2.3", + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "faye-websocket": "0.11.4", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@firebase/database-compat": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-2.0.0.tgz", + "integrity": "sha512-2xlODKWwf/vNAxCmou0GFhymx2pqZKkhXMN9B5aiTjZ6+81sOxGim53ELY2lj+qKG2IvgiCYFc4X+ZJA2Ad5vg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/database": "1.0.9", + "@firebase/database-types": "1.0.6", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@firebase/database-types": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.6.tgz", + "integrity": "sha512-sMI7IynSZBsyGbUugc8PKE1jwKbnvaieAz/RxuM57PZQNCi6Rteiviwcw/jqZOX6igqYJwXWZ3UzKOZo2nUDRA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-types": "0.9.2", + "@firebase/util": "1.10.1" + } + }, + "node_modules/@firebase/firestore": { + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.4.tgz", + "integrity": "sha512-K2nq4w+NF8J1waGawY5OHLawP/Aw5CYxyDstVv1NZemGPcM3U+LZ9EPaXr1PatYIrPA7fS4DxZoWcbB0aGJ8Zg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "@firebase/webchannel-wrapper": "1.0.2", + "@grpc/grpc-js": "~1.9.0", + "@grpc/proto-loader": "^0.7.8", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/firestore-compat": { + "version": "0.3.39", + "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.39.tgz", + "integrity": "sha512-CsK8g34jNeHx95LISDRTcArJLonW+zJCqHI1Ez9WNiLAK2X8FeQ4UiD+RwOwxAIR+t2a6xED/5Fe6ZIqx7MuoQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/firestore": "4.7.4", + "@firebase/firestore-types": "3.0.2", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/firestore-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-3.0.2.tgz", + "integrity": "sha512-wp1A+t5rI2Qc/2q7r2ZpjUXkRVPtGMd6zCLsiWurjsQpqPgFin3AhNibKcIzoF2rnToNa/XYtyWXuifjOOwDgg==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" + } + }, + "node_modules/@firebase/functions": { + "version": "0.11.9", + "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.11.9.tgz", + "integrity": "sha512-dhO5IUfQRCsrc20YD20nSOX+QCT+cH6N86HlZOLz2XgyEFgzOdBQnUot4EabBJQRkMBI7fZWUrbYfRcnov53ug==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.2", + "@firebase/auth-interop-types": "0.2.3", + "@firebase/component": "0.6.10", + "@firebase/messaging-interop-types": "0.2.2", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/functions-compat": { + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.15.tgz", + "integrity": "sha512-eiHpc6Sd9Y/SNhBsGi944SapiFbfTPKsiSUQ74QxNSs0yoxvABeIRolVMFk4TokP57NGmstGYpYte02XGNPcYw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/functions": "0.11.9", + "@firebase/functions-types": "0.6.2", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/functions-types": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.2.tgz", + "integrity": "sha512-0KiJ9lZ28nS2iJJvimpY4nNccV21rkQyor5Iheu/nq8aKXJqtJdeSlZDspjPSBBiHRzo7/GMUttegnsEITqR+w==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/installations": { + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.10.tgz", + "integrity": "sha512-TuGSOMqkFrllxa0X/8VZIqBCRH4POndU/iWKWkRmkh12+/xKSpdp+y/kWaVbsySrelltan6LeYlcYPmLibWbwg==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/util": "1.10.1", + "idb": "7.1.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/installations-compat": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.10.tgz", + "integrity": "sha512-YTonkcVz3AK7RF8xFhvs5CwDuJ0xbzzCJIwXoV14gnzdYbMgy6vWlUUbzkvbtEDXzPRHB0n7aGZl56oy9dLOFw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/installations": "0.6.10", + "@firebase/installations-types": "0.5.2", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/installations-types": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.5.2.tgz", + "integrity": "sha512-que84TqGRZJpJKHBlF2pkvc1YcXrtEDOVGiDjovP/a3s6W4nlbohGXEsBJo0JCeeg/UG9A+DEZVDUV9GpklUzA==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x" + } + }, + "node_modules/@firebase/logger": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.3.tgz", + "integrity": "sha512-Th42bWJg18EF5bJwhRosn2M/eYxmbWCwXZr4hHX7ltO0SE3QLrpgiMKeRBR/NW7vJke7i0n3i8esbCW2s93qBw==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@firebase/messaging": { + "version": "0.12.13", + "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.13.tgz", + "integrity": "sha512-YLa8PWl+BgiOVR5WOyzl21fVJFJeBRfniNuN25d9DBrQzppSAahuN6yS+vt1OIjvZNPN4pZ/lcRLYupbGu4W0w==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/installations": "0.6.10", + "@firebase/messaging-interop-types": "0.2.2", + "@firebase/util": "1.10.1", + "idb": "7.1.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/messaging-compat": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.13.tgz", + "integrity": "sha512-9ootPClS6m2c2KIzo7AqSHaWzAw28zWcjQPjVv7WeQDu6wjufpbOg+7tuVzb+gqpF9Issa3lDoYOwlO0ZudO3g==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/messaging": "0.12.13", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" + } + }, + "node_modules/@firebase/messaging-interop-types": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.2.tgz", + "integrity": "sha512-l68HXbuD2PPzDUOFb3aG+nZj5KA3INcPwlocwLZOzPp9rFM9yeuI9YLl6DQfguTX5eAGxO0doTR+rDLDvQb5tA==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/performance": { + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.10.tgz", + "integrity": "sha512-x/mNYKGxq7A+QV0EiEZeD2S+E+kw+UcZ8FXuE7qDJyGGt/0Wd+bIIL7RakG/VrFt7/UYc//nKygDc7/Ig7sOmQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/installations": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" + } + }, + "node_modules/@firebase/performance-compat": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.10.tgz", + "integrity": "sha512-0h1qYkF6I79DSSpHfTQFvb91fo8shmmwiPzWFYAPdPK02bSWpKwVssNYlZX2iUnumxerDMbl7dWN+Im/W3bnXA==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/performance": "0.6.10", + "@firebase/performance-types": "0.2.2", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz", - "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" + "node_modules/@firebase/performance-types": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.2.2.tgz", + "integrity": "sha512-gVq0/lAClVH5STrIdKnHnCo2UcPLjJlDUoEB/tB4KM+hAeHUxWKnpT0nemUPvxZ5nbdY/pybeyMe8Cs29gEcHA==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/remote-config": { + "version": "0.4.10", + "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.10.tgz", + "integrity": "sha512-jTRjy3TdqzVna19m5a1HEHE5BG4Z3BQTxBgvQRTmMKlHacx4QS0CToAas7R9M9UkxpgFcVuAE7FpWIOWQGCEWw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/installations": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" } }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz", - "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" + "node_modules/@firebase/remote-config-compat": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.10.tgz", + "integrity": "sha512-fIi5OB2zk0zpChMV/tTd0oEZcZI8TlwQDlLlcrDpMOV5l5dqd0JNlWKh6Fwmh4izmytk+rZIAIpnak/NjGVesQ==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/remote-config": "0.4.10", + "@firebase/remote-config-types": "0.3.2", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz", - "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], + "node_modules/@firebase/remote-config-types": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.3.2.tgz", + "integrity": "sha512-0BC4+Ud7y2aPTyhXJTMTFfrGGLqdYXrUB9sJVAB8NiqJswDTc4/2qrE/yfUbnQJhbSi6ZaTTBKyG3n1nplssaA==", + "license": "Apache-2.0" + }, + "node_modules/@firebase/storage": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.13.3.tgz", + "integrity": "sha512-B5HiJ7isYKaT4dOEV43f2ySdhQxzq+SQEm7lqXebJ8AYCsebdHrgGzrPR0LR962xGjPzJHFKx63gA8Be/P2MCw==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, "engines": { - "node": ">=12" + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x" } }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz", - "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], + "node_modules/@firebase/storage-compat": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.13.tgz", + "integrity": "sha512-15kje7JALswRCBKsCSvKg5FbqUYykaIMqMbZRD7I6uVRWwdyTvez5MBQfMhBia2JcEmPiDpXhJTXH4PAWFiA8g==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/component": "0.6.10", + "@firebase/storage": "0.13.3", + "@firebase/storage-types": "0.8.2", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, "engines": { - "node": ">=12" + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app-compat": "0.x" } }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz", - "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" + "node_modules/@firebase/storage-types": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.8.2.tgz", + "integrity": "sha512-0vWu99rdey0g53lA7IShoA2Lol1jfnPovzLDUBuon65K7uKG9G+L5uO05brD9pMw+l4HRFw23ah3GwTGpEav6g==", + "license": "Apache-2.0", + "peerDependencies": { + "@firebase/app-types": "0.x", + "@firebase/util": "1.x" } }, - "node_modules/@esbuild/linux-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", - "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], + "node_modules/@firebase/util": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.1.tgz", + "integrity": "sha512-AIhFnCCjM8FmCqSNlNPTuOk3+gpHC1RkeNUBLtPbcqGYpN5MxI5q7Yby+rxycweOZOCboDzfIj8WyaY4tpQG/g==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + }, "engines": { - "node": ">=12" + "node": ">=18.0.0" } }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz", - "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], + "node_modules/@firebase/vertexai": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@firebase/vertexai/-/vertexai-1.0.0.tgz", + "integrity": "sha512-48N3Lp/9GgiCCRfrSdHS+Y1IiMdYXvnHFO/f+HL1PgUtBq7WQ/fWmYOX3mzAN36zvytq13nb68ImF+GALopp+Q==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.2", + "@firebase/component": "0.6.10", + "@firebase/logger": "0.4.3", + "@firebase/util": "1.10.1", + "tslib": "^2.1.0" + }, "engines": { - "node": ">=12" + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x", + "@firebase/app-types": "0.x" } }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz", - "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], + "node_modules/@firebase/vertexai-preview": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@firebase/vertexai-preview/-/vertexai-preview-0.0.4.tgz", + "integrity": "sha512-EBSqyu9eg8frQlVU9/HjKtHN7odqbh9MtAcVz3WwHj4gLCLOoN9F/o+oxlq3CxvFrd3CNTZwu6d2mZtVlEInng==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/app-check-interop-types": "0.3.2", + "@firebase/component": "0.6.9", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" + }, "engines": { - "node": ">=12" + "node": ">=18.0.0" + }, + "peerDependencies": { + "@firebase/app": "0.x", + "@firebase/app-types": "0.x" } }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz", - "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" + "node_modules/@firebase/vertexai-preview/node_modules/@firebase/component": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.9.tgz", + "integrity": "sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" } }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz", - "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" + "node_modules/@firebase/vertexai-preview/node_modules/@firebase/logger": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", + "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" } }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz", - "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], + "node_modules/@firebase/vertexai-preview/node_modules/@firebase/util": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz", + "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/webchannel-wrapper": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.2.tgz", + "integrity": "sha512-3F4iA2E+NtdMbOU0XC1cHE8q6MqpGIKRj62oGOF38S6AAx5VHR9cXmoDUSj7ejvTAT7m6jxuEeQkHeq0F+mU2w==", + "license": "Apache-2.0" + }, + "node_modules/@grpc/grpc-js": { + "version": "1.9.15", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz", + "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==", + "license": "Apache-2.0", + "dependencies": { + "@grpc/proto-loader": "^0.7.8", + "@types/node": ">=12.12.47" + }, "engines": { - "node": ">=12" + "node": "^8.13.0 || >=10.10.0" } }, - "node_modules/@esbuild/win32-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz", - "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], + "node_modules/@grpc/proto-loader": { + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", + "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==", + "license": "Apache-2.0", + "dependencies": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.2.5", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, "engines": { - "node": ">=12" + "node": ">=6" } }, "node_modules/@isaacs/cliui": { @@ -3534,7 +4940,6 @@ }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", - "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { @@ -4838,6 +6243,70 @@ "dev": true, "license": "MIT" }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "license": "BSD-3-Clause", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==", + "license": "BSD-3-Clause" + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.24.0", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz", @@ -5050,7 +6519,6 @@ "version": "17.3.10", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.10.tgz", "integrity": "sha512-cI+VB/WXlOeAMamni932lE/AZgui8o81dMyEXNXqCuYagNAMuKXliW79Mi5BwYQEABv/BUb4hB4zYtbQqHyACA==", - "dev": true, "dependencies": { "@angular-devkit/core": "17.3.10", "@angular-devkit/schematics": "17.3.10", @@ -5065,8 +6533,7 @@ "node_modules/@schematics/angular/node_modules/jsonc-parser": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", - "dev": true + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" }, "node_modules/@sentry-internal/browser-utils": { "version": "8.35.0", @@ -5953,7 +7420,6 @@ "version": "18.19.64", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.64.tgz", "integrity": "sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ==", - "dev": true, "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -6035,6 +7501,12 @@ "@types/node": "*" } }, + "node_modules/@types/triple-beam": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", + "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", + "license": "MIT" + }, "node_modules/@types/w3c-web-hid": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/w3c-web-hid/-/w3c-web-hid-1.0.6.tgz", @@ -6337,7 +7809,6 @@ }, "node_modules/ajv": { "version": "8.12.0", - "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -6352,7 +7823,6 @@ }, "node_modules/ajv-formats": { "version": "2.1.1", - "dev": true, "license": "MIT", "dependencies": { "ajv": "^8.0.0" @@ -6387,7 +7857,6 @@ }, "node_modules/ansi-escapes": { "version": "4.3.2", - "dev": true, "license": "MIT", "dependencies": { "type-fest": "^0.21.3" @@ -6413,7 +7882,6 @@ }, "node_modules/ansi-regex": { "version": "5.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -6433,7 +7901,7 @@ }, "node_modules/anymatch": { "version": "3.1.3", - "dev": true, + "devOptional": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -6507,7 +7975,6 @@ }, "node_modules/async": { "version": "3.2.5", - "dev": true, "license": "MIT" }, "node_modules/async-each-series": { @@ -6754,7 +8221,7 @@ }, "node_modules/binary-extensions": { "version": "2.2.0", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -6762,7 +8229,6 @@ }, "node_modules/bl": { "version": "4.1.0", - "dev": true, "license": "MIT", "dependencies": { "buffer": "^5.5.0", @@ -6774,7 +8240,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, "funding": [ { "type": "github", @@ -6871,7 +8336,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -7527,8 +8992,7 @@ "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "node_modules/check-more-types": { "version": "2.24.0", @@ -7540,7 +9004,7 @@ }, "node_modules/chokidar": { "version": "3.5.3", - "dev": true, + "devOptional": true, "funding": [ { "type": "individual", @@ -7605,7 +9069,6 @@ }, "node_modules/cli-cursor": { "version": "3.1.0", - "dev": true, "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" @@ -7616,7 +9079,6 @@ }, "node_modules/cli-spinners": { "version": "2.9.2", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -7665,7 +9127,6 @@ }, "node_modules/cliui": { "version": "8.0.1", - "dev": true, "license": "ISC", "dependencies": { "string-width": "^4.2.0", @@ -7678,7 +9139,6 @@ }, "node_modules/clone": { "version": "1.0.4", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8" @@ -7697,11 +9157,20 @@ "node": ">=6" } }, + "node_modules/color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "dependencies": { "color-name": "1.1.3" } @@ -7709,14 +9178,33 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "license": "MIT", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } }, "node_modules/colorette": { "version": "2.0.20", "dev": true, "license": "MIT" }, + "node_modules/colorspace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", + "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", + "license": "MIT", + "dependencies": { + "color": "^3.1.3", + "text-hex": "1.0.x" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "dev": true, @@ -8912,7 +10400,6 @@ }, "node_modules/defaults": { "version": "1.0.4", - "dev": true, "license": "MIT", "dependencies": { "clone": "^1.0.2" @@ -8939,7 +10426,6 @@ }, "node_modules/define-lazy-prop": { "version": "2.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -9232,7 +10718,6 @@ }, "node_modules/emoji-regex": { "version": "8.0.0", - "dev": true, "license": "MIT" }, "node_modules/emojis-list": { @@ -9243,6 +10728,12 @@ "node": ">= 4" } }, + "node_modules/enabled": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", + "license": "MIT" + }, "node_modules/encodeurl": { "version": "1.0.2", "license": "MIT", @@ -9518,7 +11009,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, "engines": { "node": ">=6" } @@ -9533,7 +11023,6 @@ }, "node_modules/escape-string-regexp": { "version": "1.0.5", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.0" @@ -9776,7 +11265,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -9829,7 +11317,6 @@ }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "dev": true, "license": "MIT" }, "node_modules/fast-glob": { @@ -9864,7 +11351,6 @@ "version": "0.11.4", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", - "dev": true, "dependencies": { "websocket-driver": ">=0.5.1" }, @@ -9880,9 +11366,14 @@ "pend": "~1.2.0" } }, + "node_modules/fecha": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", + "license": "MIT" + }, "node_modules/figures": { "version": "3.2.0", - "dev": true, "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" @@ -9898,7 +11389,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -9975,6 +11466,42 @@ "node": ">=8" } }, + "node_modules/firebase": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/firebase/-/firebase-11.0.1.tgz", + "integrity": "sha512-qsFb8dMcQINEDhJteG7RP+GqwgSRvfyiexQqHd5JToDdm87i9I2rGC4XQsGawKGxzKwZ/ISdgwNWxXAFYdCC6A==", + "license": "Apache-2.0", + "dependencies": { + "@firebase/analytics": "0.10.9", + "@firebase/analytics-compat": "0.2.15", + "@firebase/app": "0.10.15", + "@firebase/app-check": "0.8.9", + "@firebase/app-check-compat": "0.3.16", + "@firebase/app-compat": "0.2.45", + "@firebase/app-types": "0.9.2", + "@firebase/auth": "1.8.0", + "@firebase/auth-compat": "0.5.15", + "@firebase/data-connect": "0.1.1", + "@firebase/database": "1.0.9", + "@firebase/database-compat": "2.0.0", + "@firebase/firestore": "4.7.4", + "@firebase/firestore-compat": "0.3.39", + "@firebase/functions": "0.11.9", + "@firebase/functions-compat": "0.3.15", + "@firebase/installations": "0.6.10", + "@firebase/installations-compat": "0.2.10", + "@firebase/messaging": "0.12.13", + "@firebase/messaging-compat": "0.2.13", + "@firebase/performance": "0.6.10", + "@firebase/performance-compat": "0.2.10", + "@firebase/remote-config": "0.4.10", + "@firebase/remote-config-compat": "0.2.10", + "@firebase/storage": "0.13.3", + "@firebase/storage-compat": "0.3.13", + "@firebase/util": "1.10.1", + "@firebase/vertexai": "1.0.0" + } + }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -9989,6 +11516,12 @@ "dev": true, "license": "ISC" }, + "node_modules/fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", + "license": "MIT" + }, "node_modules/follow-redirects": { "version": "1.15.3", "dev": true, @@ -10075,7 +11608,6 @@ }, "node_modules/fs-extra": { "version": "8.1.0", - "dev": true, "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", @@ -10128,6 +11660,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/fuzzy": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz", + "integrity": "sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==", + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "dev": true, @@ -10138,7 +11678,6 @@ }, "node_modules/get-caller-file": { "version": "2.0.5", - "dev": true, "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" @@ -10219,7 +11758,7 @@ }, "node_modules/glob-parent": { "version": "5.1.2", - "dev": true, + "devOptional": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -10294,7 +11833,6 @@ }, "node_modules/graceful-fs": { "version": "4.2.11", - "dev": true, "license": "ISC" }, "node_modules/gzip-size": { @@ -10510,8 +12048,7 @@ "node_modules/http-parser-js": { "version": "0.5.8", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", - "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", - "dev": true + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==" }, "node_modules/http-proxy": { "version": "1.18.1", @@ -10620,6 +12157,12 @@ "postcss": "^8.1.0" } }, + "node_modules/idb": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", + "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==", + "license": "ISC" + }, "node_modules/ieee754": { "version": "1.2.1", "funding": [ @@ -10898,7 +12441,7 @@ }, "node_modules/is-binary-path": { "version": "2.1.0", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -10935,7 +12478,6 @@ }, "node_modules/is-docker": { "version": "2.2.1", - "dev": true, "license": "MIT", "bin": { "is-docker": "cli.js" @@ -10949,7 +12491,7 @@ }, "node_modules/is-extglob": { "version": "2.1.1", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -10957,7 +12499,6 @@ }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -10965,7 +12506,7 @@ }, "node_modules/is-glob": { "version": "4.0.3", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -10991,7 +12532,6 @@ }, "node_modules/is-interactive": { "version": "1.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -11007,7 +12547,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -11056,7 +12596,6 @@ }, "node_modules/is-stream": { "version": "2.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -11072,7 +12611,6 @@ }, "node_modules/is-unicode-supported": { "version": "0.1.0", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -11088,7 +12626,6 @@ }, "node_modules/is-wsl": { "version": "2.2.0", - "dev": true, "license": "MIT", "dependencies": { "is-docker": "^2.0.0" @@ -11346,7 +12883,6 @@ }, "node_modules/json-schema-traverse": { "version": "1.0.0", - "dev": true, "license": "MIT" }, "node_modules/json-stringify-safe": { @@ -11365,9 +12901,14 @@ "node": ">=6" } }, + "node_modules/jsonc-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", + "license": "MIT" + }, "node_modules/jsonfile": { "version": "4.0.0", - "dev": true, "license": "MIT", "optionalDependencies": { "graceful-fs": "^4.1.6" @@ -11559,6 +13100,12 @@ "node": ">= 8" } }, + "node_modules/kuler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", + "license": "MIT" + }, "node_modules/launch-editor": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz", @@ -11752,7 +13299,12 @@ }, "node_modules/lodash": { "version": "4.17.21", - "dev": true, + "license": "MIT" + }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", "license": "MIT" }, "node_modules/lodash.debounce": { @@ -11775,7 +13327,6 @@ }, "node_modules/log-symbols": { "version": "4.1.0", - "dev": true, "license": "MIT", "dependencies": { "chalk": "^4.1.0", @@ -11790,7 +13341,6 @@ }, "node_modules/log-symbols/node_modules/ansi-styles": { "version": "4.3.0", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -11804,7 +13354,6 @@ }, "node_modules/log-symbols/node_modules/chalk": { "version": "4.1.2", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -11819,7 +13368,6 @@ }, "node_modules/log-symbols/node_modules/color-convert": { "version": "2.0.1", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -11830,12 +13378,10 @@ }, "node_modules/log-symbols/node_modules/color-name": { "version": "1.1.4", - "dev": true, "license": "MIT" }, "node_modules/log-symbols/node_modules/has-flag": { "version": "4.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -11843,7 +13389,6 @@ }, "node_modules/log-symbols/node_modules/supports-color": { "version": "7.2.0", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -11943,6 +13488,38 @@ "node": ">=8.0" } }, + "node_modules/logform": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", + "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", + "license": "MIT", + "dependencies": { + "@colors/colors": "1.6.0", + "@types/triple-beam": "^1.3.2", + "fecha": "^4.2.0", + "ms": "^2.1.1", + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/logform/node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/long": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==", + "license": "Apache-2.0" + }, "node_modules/lru-cache": { "version": "5.1.1", "dev": true, @@ -11955,7 +13532,6 @@ "version": "0.30.8", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", - "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -12139,7 +13715,6 @@ }, "node_modules/mimic-fn": { "version": "2.1.0", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -12712,7 +14287,7 @@ }, "node_modules/normalize-path": { "version": "3.0.0", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -12900,9 +14475,17 @@ "wrappy": "1" } }, + "node_modules/one-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "license": "MIT", + "dependencies": { + "fn.name": "1.x.x" + } + }, "node_modules/onetime": { "version": "5.1.2", - "dev": true, "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" @@ -12916,7 +14499,6 @@ }, "node_modules/open": { "version": "8.4.2", - "dev": true, "license": "MIT", "dependencies": { "define-lazy-prop": "^2.0.0", @@ -12963,7 +14545,6 @@ }, "node_modules/ora": { "version": "5.4.1", - "dev": true, "license": "MIT", "dependencies": { "bl": "^4.1.0", @@ -12985,7 +14566,6 @@ }, "node_modules/ora/node_modules/ansi-styles": { "version": "4.3.0", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -12999,7 +14579,6 @@ }, "node_modules/ora/node_modules/chalk": { "version": "4.1.2", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -13014,7 +14593,6 @@ }, "node_modules/ora/node_modules/color-convert": { "version": "2.0.1", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -13025,12 +14603,10 @@ }, "node_modules/ora/node_modules/color-name": { "version": "1.1.4", - "dev": true, "license": "MIT" }, "node_modules/ora/node_modules/has-flag": { "version": "4.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -13038,7 +14614,6 @@ }, "node_modules/ora/node_modules/supports-color": { "version": "7.2.0", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -13051,7 +14626,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -13341,7 +14915,7 @@ }, "node_modules/picomatch": { "version": "2.3.1", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -13674,6 +15248,30 @@ "node": ">=10" } }, + "node_modules/protobufjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", + "hasInstallScript": true, + "license": "BSD-3-Clause", + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -13721,7 +15319,6 @@ }, "node_modules/punycode": { "version": "2.3.1", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -13894,7 +15491,6 @@ }, "node_modules/readable-stream": { "version": "3.6.2", - "dev": true, "license": "MIT", "dependencies": { "inherits": "^2.0.3", @@ -13907,7 +15503,7 @@ }, "node_modules/readdirp": { "version": "3.6.0", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -14016,7 +15612,6 @@ }, "node_modules/require-directory": { "version": "2.1.1", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -14024,7 +15619,6 @@ }, "node_modules/require-from-string": { "version": "2.0.2", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -14128,7 +15722,6 @@ }, "node_modules/restore-cursor": { "version": "3.1.0", - "dev": true, "license": "MIT", "dependencies": { "onetime": "^5.1.0", @@ -14281,6 +15874,15 @@ ], "license": "MIT" }, + "node_modules/safe-stable-stringify": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", + "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/safer-buffer": { "version": "2.1.2", "license": "MIT" @@ -14665,7 +16267,6 @@ }, "node_modules/signal-exit": { "version": "3.0.7", - "dev": true, "license": "ISC" }, "node_modules/sigstore": { @@ -14685,6 +16286,21 @@ "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/simple-swizzle/node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "license": "MIT" + }, "node_modules/sirv": { "version": "2.0.3", "dev": true, @@ -14876,7 +16492,6 @@ }, "node_modules/source-map": { "version": "0.7.4", - "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">= 8" @@ -15042,6 +16657,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/statuses": { "version": "1.5.0", "dev": true, @@ -15082,7 +16706,6 @@ }, "node_modules/string_decoder": { "version": "1.3.0", - "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" @@ -15090,7 +16713,6 @@ }, "node_modules/string-width": { "version": "4.2.3", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -15118,7 +16740,6 @@ }, "node_modules/strip-ansi": { "version": "6.0.1", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -15393,6 +17014,12 @@ "node": ">=8" } }, + "node_modules/text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", + "license": "MIT" + }, "node_modules/throttleit": { "version": "1.0.1", "dev": true, @@ -15403,7 +17030,6 @@ }, "node_modules/through": { "version": "2.3.8", - "dev": true, "license": "MIT" }, "node_modules/thunky": { @@ -15420,7 +17046,6 @@ "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -15432,7 +17057,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -15492,6 +17117,15 @@ "tree-kill": "cli.js" } }, + "node_modules/triple-beam": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", + "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", + "license": "MIT", + "engines": { + "node": ">= 14.0.0" + } + }, "node_modules/ts-node": { "version": "10.9.2", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", @@ -15586,7 +17220,6 @@ }, "node_modules/type-fest": { "version": "0.21.3", - "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" @@ -15664,7 +17297,6 @@ }, "node_modules/undici-types": { "version": "5.26.5", - "dev": true, "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { @@ -15733,7 +17365,6 @@ }, "node_modules/universalify": { "version": "0.1.2", - "dev": true, "license": "MIT", "engines": { "node": ">= 4.0.0" @@ -15786,7 +17417,6 @@ }, "node_modules/uri-js": { "version": "4.4.1", - "dev": true, "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" @@ -15803,7 +17433,6 @@ }, "node_modules/util-deprecate": { "version": "1.0.2", - "dev": true, "license": "MIT" }, "node_modules/utils-merge": { @@ -16391,7 +18020,6 @@ }, "node_modules/wcwidth": { "version": "1.0.1", - "dev": true, "license": "MIT", "dependencies": { "defaults": "^1.0.3" @@ -16737,7 +18365,6 @@ "version": "0.7.4", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", - "dev": true, "dependencies": { "http-parser-js": ">=0.5.1", "safe-buffer": ">=5.1.0", @@ -16751,7 +18378,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true, "engines": { "node": ">=0.8.0" } @@ -16782,9 +18408,53 @@ "dev": true, "license": "MIT" }, + "node_modules/winston": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz", + "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==", + "license": "MIT", + "dependencies": { + "@colors/colors": "^1.6.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.7.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.9.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/winston-transport": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", + "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", + "license": "MIT", + "dependencies": { + "logform": "^2.7.0", + "readable-stream": "^3.6.2", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/winston/node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "license": "MIT", + "engines": { + "node": ">=0.1.90" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -16851,7 +18521,6 @@ }, "node_modules/wrap-ansi/node_modules/ansi-styles": { "version": "4.3.0", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -16865,7 +18534,6 @@ }, "node_modules/wrap-ansi/node_modules/color-convert": { "version": "2.0.1", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -16876,7 +18544,6 @@ }, "node_modules/wrap-ansi/node_modules/color-name": { "version": "1.1.4", - "dev": true, "license": "MIT" }, "node_modules/wrappy": { @@ -16924,7 +18591,6 @@ }, "node_modules/y18n": { "version": "5.0.8", - "dev": true, "license": "ISC", "engines": { "node": ">=10" @@ -16937,7 +18603,6 @@ }, "node_modules/yargs": { "version": "17.7.2", - "dev": true, "license": "MIT", "dependencies": { "cliui": "^8.0.1", @@ -16954,7 +18619,6 @@ }, "node_modules/yargs-parser": { "version": "21.1.1", - "dev": true, "license": "ISC", "engines": { "node": ">=12" diff --git a/frontend/package.json b/frontend/package.json index 867bde01a2..549ac8d225 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -17,7 +17,9 @@ "serve:ssr": "node dist/frontend/server/main.js", "build:ssr": "ng build && ng run frontend:server", "prerender": "ng run frontend:prerender", - "sentry:sourcemaps": "sentry-cli sourcemaps inject --org openmina-uv --project openmina ./dist/frontend/browser && sentry-cli sourcemaps upload --org openmina-uv --project openmina ./dist/frontend/browser" + "sentry:sourcemaps": "sentry-cli sourcemaps inject --org openmina-uv --project openmina ./dist/frontend/browser && sentry-cli sourcemaps upload --org openmina-uv --project openmina ./dist/frontend/browser", + "copy-env": "cp dist/frontend/browser/assets/environments/webnode.js dist/frontend/browser/assets/environments/env.js", + "deploy": "npm run build:prod && npm run copy-env && firebase deploy" }, "private": true, "dependencies": { @@ -26,6 +28,7 @@ "@angular/common": "^17.3.12", "@angular/compiler": "^17.3.12", "@angular/core": "^17.3.12", + "@angular/fire": "^17.1.0", "@angular/forms": "^17.3.12", "@angular/material": "^17.3.10", "@angular/platform-browser": "^17.3.12", @@ -49,6 +52,7 @@ "d3": "^7.8.4", "eigen": "^0.2.2", "express": "^4.18.2", + "firebase": "^11.0.1", "mathjs": "^12.3.0", "mina-signer": "^3.0.7", "ngx-json-viewer": "^3.2.1", @@ -82,4 +86,4 @@ "webpack": "^5.88.2", "webpack-bundle-analyzer": "^4.9.0" } -} \ No newline at end of file +} diff --git a/frontend/scripts/download-webnode.sh b/frontend/scripts/download-webnode.sh new file mode 100644 index 0000000000..791aa0103b --- /dev/null +++ b/frontend/scripts/download-webnode.sh @@ -0,0 +1,60 @@ +#!/bin/bash + +# Set the base URL for OpenMina +OPENMINA_BASE_URL="https://github.com/openmina" + +# Function to download circuit files +download_circuit_files() { + CIRCUITS_BASE_URL="$OPENMINA_BASE_URL/circuit-blobs/releases/download" + CIRCUITS_VERSION="3.0.1devnet" + + DEVNET_CIRCUIT_FILES=( + "block_verifier_index.postcard" + "transaction_verifier_index.postcard" + "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_gates.json" + "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_internal_vars.bin" + "step-step-proving-key-blockchain-snark-step-0-55f640777b6486a6fd3fdbc3fcffcc60_rows_rev.bin" + "step-step-proving-key-transaction-snark-merge-1-ba1d52dfdc2dd4d2e61f6c66ff2a5b2f_gates.json" + "step-step-proving-key-transaction-snark-merge-1-ba1d52dfdc2dd4d2e61f6c66ff2a5b2f_internal_vars.bin" + "step-step-proving-key-transaction-snark-merge-1-ba1d52dfdc2dd4d2e61f6c66ff2a5b2f_rows_rev.bin" + "step-step-proving-key-transaction-snark-opt_signed-3-9eefed16953d2bfa78a257adece02d47_gates.json" + "step-step-proving-key-transaction-snark-opt_signed-3-9eefed16953d2bfa78a257adece02d47_internal_vars.bin" + "step-step-proving-key-transaction-snark-opt_signed-3-9eefed16953d2bfa78a257adece02d47_rows_rev.bin" + "step-step-proving-key-transaction-snark-opt_signed-opt_signed-2-48925e6a97197028e1a7c1ecec09021d_gates.json" + "step-step-proving-key-transaction-snark-opt_signed-opt_signed-2-48925e6a97197028e1a7c1ecec09021d_internal_vars.bin" + "step-step-proving-key-transaction-snark-opt_signed-opt_signed-2-48925e6a97197028e1a7c1ecec09021d_rows_rev.bin" + "step-step-proving-key-transaction-snark-proved-4-0cafcbc6dffccddbc82f8c2519c16341_gates.json" + "step-step-proving-key-transaction-snark-proved-4-0cafcbc6dffccddbc82f8c2519c16341_internal_vars.bin" + "step-step-proving-key-transaction-snark-proved-4-0cafcbc6dffccddbc82f8c2519c16341_rows_rev.bin" + "step-step-proving-key-transaction-snark-transaction-0-c33ec5211c07928c87e850a63c6a2079_gates.json" + "step-step-proving-key-transaction-snark-transaction-0-c33ec5211c07928c87e850a63c6a2079_internal_vars.bin" + "step-step-proving-key-transaction-snark-transaction-0-c33ec5211c07928c87e850a63c6a2079_rows_rev.bin" + "wrap-wrap-proving-key-blockchain-snark-bbecaf158ca543ec8ac9e7144400e669_gates.json" + "wrap-wrap-proving-key-blockchain-snark-bbecaf158ca543ec8ac9e7144400e669_internal_vars.bin" + "wrap-wrap-proving-key-blockchain-snark-bbecaf158ca543ec8ac9e7144400e669_rows_rev.bin" + "wrap-wrap-proving-key-transaction-snark-b9a01295c8cc9bda6d12142a581cd305_gates.json" + "wrap-wrap-proving-key-transaction-snark-b9a01295c8cc9bda6d12142a581cd305_internal_vars.bin" + "wrap-wrap-proving-key-transaction-snark-b9a01295c8cc9bda6d12142a581cd305_rows_rev.bin" + ) + DOWNLOAD_DIR="/Users/teofil/teo/mina/openmina/frontend/dist/frontend/browser/assets/webnode/circuit-blobs/$CIRCUITS_VERSION" + + mkdir -p "$DOWNLOAD_DIR" + + for FILE in "${DEVNET_CIRCUIT_FILES[@]}"; do + if [[ -f "$DOWNLOAD_DIR/$FILE" ]]; then + echo "$FILE already exists in $DOWNLOAD_DIR, skipping download." + else + echo "Downloading $FILE to $DOWNLOAD_DIR..." + curl -s -L --retry 3 --retry-delay 5 -o "$DOWNLOAD_DIR/$FILE" "$CIRCUITS_BASE_URL/$CIRCUITS_VERSION/$FILE" + if [[ $? -ne 0 ]]; then + echo "Failed to download $FILE after 3 attempts, exiting." + exit 1 + else + echo "$FILE downloaded successfully to $DOWNLOAD_DIR" + fi + fi + done +} + +# Call the function to download circuit files +download_circuit_files diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 775c514c6d..127d67b90b 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -9,7 +9,8 @@ import { GlobalErrorHandlerService, HorizontalMenuComponent, NgrxRouterStoreModule, - OpenminaEagerSharedModule, safelyExecuteInBrowser, + OpenminaEagerSharedModule, + safelyExecuteInBrowser, THEME_PROVIDER, } from '@openmina/shared'; import { CommonModule, registerLocaleData } from '@angular/common'; @@ -35,6 +36,9 @@ import { ReactiveFormsModule } from '@angular/forms'; import { WebNodeLandingPageComponent } from '@app/layout/web-node-landing-page/web-node-landing-page.component'; import * as Sentry from '@sentry/angular'; import { Router } from '@angular/router'; +import { initializeApp, provideFirebaseApp } from '@angular/fire/app'; +import { getAnalytics, provideAnalytics, ScreenTrackingService } from '@angular/fire/analytics'; +import { getPerformance, providePerformance } from '@angular/fire/performance'; registerLocaleData(localeFr, 'fr'); registerLocaleData(localeEn, 'en'); @@ -55,13 +59,13 @@ export class AppGlobalErrorhandler implements ErrorHandler { const self = this; // Global error handler - window.onerror = function(msg, url, line, column, error) { + window.onerror = function (msg, url, line, column, error) { self.handleError(error || msg); return false; }; // Unhandled promise rejections - window.onunhandledrejection = function(event) { + window.onunhandledrejection = function (event) { event.preventDefault(); self.handleError(event.reason); }; @@ -89,7 +93,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { const originalInstantiateStreaming = WebAssembly.instantiateStreaming; if (originalInstantiateStreaming) { - WebAssembly.instantiateStreaming = async function(response: any, importObject?: any): Promise { + WebAssembly.instantiateStreaming = async function (response: any, importObject?: any): Promise { try { return await originalInstantiateStreaming.call(WebAssembly, response, importObject); } catch (error) { @@ -100,7 +104,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { } const originalInstantiate = WebAssembly.instantiate; - WebAssembly.instantiate = async function(moduleObject: any, importObject?: any): Promise { + WebAssembly.instantiate = async function (moduleObject: any, importObject?: any): Promise { try { return await originalInstantiate.call(WebAssembly, moduleObject, importObject); } catch (error) { @@ -170,6 +174,23 @@ export class AppGlobalErrorhandler implements ErrorHandler { }, provideClientHydration(), provideHttpClient(withFetch()), + provideFirebaseApp(() => initializeApp({ + 'projectId': 'openminawebnode', + 'appId': '1:120031499786:web:9af56c50ebce25c619f1f3', + 'storageBucket': 'openminawebnode.firebasestorage.app', + 'apiKey': 'AIzaSyBreMkb5-8ANb5zL6yWKgRAk9owbDS1g9s', + 'authDomain': 'openminawebnode.firebaseapp.com', + 'messagingSenderId': '120031499786', + 'measurementId': 'G-V0ZC81T9RQ', + })), + provideAnalytics(() => getAnalytics()), + ScreenTrackingService, + // provideAppCheck(() => { + // // TODO get a reCAPTCHA Enterprise here https://console.cloud.google.com/security/recaptcha?project=_ + // const provider = new ReCaptchaEnterpriseProvider(/* reCAPTCHA Enterprise site key */); + // return initializeAppCheck(undefined, { provider, isTokenAutoRefreshEnabled: true }); + // }), + providePerformance(() => getPerformance()), ], bootstrap: [AppComponent], }) diff --git a/frontend/src/app/core/helpers/file-progress.helper.ts b/frontend/src/app/core/helpers/file-progress.helper.ts index 4b608ee40b..4347a22a71 100644 --- a/frontend/src/app/core/helpers/file-progress.helper.ts +++ b/frontend/src/app/core/helpers/file-progress.helper.ts @@ -32,7 +32,7 @@ class AssetMonitor { url: resource.toString(), startTime, progress: 0, - totalSize: 0, + totalSize: 27355980, status: 'pending', endTime: 0, duration: 0, @@ -44,8 +44,6 @@ class AssetMonitor { try { const response = await originalFetch(resource, options); const reader = response.clone().body.getReader(); - const contentLength = +response.headers.get('Content-Length'); - downloadInfo.totalSize = contentLength; let receivedLength = 0; while (true) { @@ -57,7 +55,7 @@ class AssetMonitor { } receivedLength += value.length; - downloadInfo.progress = (receivedLength / contentLength) * 100; + downloadInfo.progress = (receivedLength / downloadInfo.totalSize) * 100; self.emitProgress(downloadInfo); } catch (error) { downloadInfo.status = 'error'; diff --git a/frontend/src/assets/environments/webnode.js b/frontend/src/assets/environments/webnode.js index 1f66bf4d31..d6dd167f07 100644 --- a/frontend/src/assets/environments/webnode.js +++ b/frontend/src/assets/environments/webnode.js @@ -16,7 +16,7 @@ export default { }, sentry: { dsn: 'https://69aba72a6290383494290cf285ab13b3@o4508216158584832.ingest.de.sentry.io/4508216160616528', - tracingOrigins: ['https://www.openmina.com'], + tracingOrigins: ['https://www.openmina.com', 'openminawebnode.firebaseapp.com', 'openminawebnode.firebasestorage.app'], }, configs: [ { diff --git a/frontend/src/assets/webnode/.gitignore b/frontend/src/assets/webnode/.gitignore index f735b09de9..8045c492a4 100644 --- a/frontend/src/assets/webnode/.gitignore +++ b/frontend/src/assets/webnode/.gitignore @@ -1,4 +1,6 @@ #.gitignore +/circuit-blobs circuit-blobs +circuit-blobs/** pkg web-node-secrets.json From 7acbc66987c2a4c82fc64a2980137a246a209c8f Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Fri, 15 Nov 2024 09:19:46 -0300 Subject: [PATCH 069/175] feat(rpc): Add `next_won_slot` info to `/status` response --- node/src/rpc/mod.rs | 1 + node/src/rpc_effectful/rpc_effectful_effects.rs | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/node/src/rpc/mod.rs b/node/src/rpc/mod.rs index cbd511863e..89e32c623e 100644 --- a/node/src/rpc/mod.rs +++ b/node/src/rpc/mod.rs @@ -453,6 +453,7 @@ pub struct RpcNodeStatus { pub peers: Vec, pub snark_pool: RpcNodeStatusSnarkPool, pub transaction_pool: RpcNodeStatusTransactionPool, + pub next_won_slot: Option, } #[derive(Serialize, Debug, Clone)] diff --git a/node/src/rpc_effectful/rpc_effectful_effects.rs b/node/src/rpc_effectful/rpc_effectful_effects.rs index 9fe4058a7d..8e421b813b 100644 --- a/node/src/rpc_effectful/rpc_effectful_effects.rs +++ b/node/src/rpc_effectful/rpc_effectful_effects.rs @@ -17,10 +17,11 @@ use crate::{ RpcTransactionInjectResponse, TransactionStatus, }, snark_pool::SnarkPoolAction, + stats::block_producer::BlockProductionAttemptWonSlot, transition_frontier::sync::{ ledger::TransitionFrontierSyncLedgerState, TransitionFrontierSyncState, }, - Service, Store, + Service, State, Store, }; use ledger::{ scan_state::currency::{Balance, Magnitude}, @@ -46,6 +47,15 @@ macro_rules! respond_or_log { }; } +fn get_next_won_slot(state: &State) -> Option { + let best_tip = state.transition_frontier.best_tip()?; + let vrf = state.block_producer.vrf_evaluator()?; + let (_, won_slot) = vrf.won_slots.first_key_value()?; + + let won_slot = BlockProducerWonSlot::from_vrf_won_slot(won_slot, best_tip.genesis_timestamp()); + Some((&won_slot).into()) +} + pub fn rpc_effects(store: &mut Store, action: ActionWithMeta) { let (action, meta) = action.split(); @@ -64,6 +74,7 @@ pub fn rpc_effects(store: &mut Store, action: ActionWithMeta(store: &mut Store, action: ActionWithMeta Date: Fri, 15 Nov 2024 11:05:40 -0300 Subject: [PATCH 070/175] fix(rpc): Fix `next_won_slot` --- node/src/rpc_effectful/rpc_effectful_effects.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/node/src/rpc_effectful/rpc_effectful_effects.rs b/node/src/rpc_effectful/rpc_effectful_effects.rs index 8e421b813b..db6e6b5feb 100644 --- a/node/src/rpc_effectful/rpc_effectful_effects.rs +++ b/node/src/rpc_effectful/rpc_effectful_effects.rs @@ -49,10 +49,9 @@ macro_rules! respond_or_log { fn get_next_won_slot(state: &State) -> Option { let best_tip = state.transition_frontier.best_tip()?; + let cur_global_slot = state.cur_global_slot()?; let vrf = state.block_producer.vrf_evaluator()?; - let (_, won_slot) = vrf.won_slots.first_key_value()?; - - let won_slot = BlockProducerWonSlot::from_vrf_won_slot(won_slot, best_tip.genesis_timestamp()); + let won_slot = vrf.next_won_slot(cur_global_slot, best_tip)?; Some((&won_slot).into()) } From b0c6f0f28f1f5843f1d695d7aa9bdc4238dd429d Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Fri, 15 Nov 2024 12:35:16 -0300 Subject: [PATCH 071/175] fix(rpc): Replace `next_won_slot` in `/status` with `current_block_production_attempt` --- node/src/rpc/mod.rs | 2 +- .../src/rpc_effectful/rpc_effectful_effects.rs | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/node/src/rpc/mod.rs b/node/src/rpc/mod.rs index 89e32c623e..089c4e1230 100644 --- a/node/src/rpc/mod.rs +++ b/node/src/rpc/mod.rs @@ -453,7 +453,7 @@ pub struct RpcNodeStatus { pub peers: Vec, pub snark_pool: RpcNodeStatusSnarkPool, pub transaction_pool: RpcNodeStatusTransactionPool, - pub next_won_slot: Option, + pub current_block_production_attempt: Option, } #[derive(Serialize, Debug, Clone)] diff --git a/node/src/rpc_effectful/rpc_effectful_effects.rs b/node/src/rpc_effectful/rpc_effectful_effects.rs index db6e6b5feb..251ea96bc4 100644 --- a/node/src/rpc_effectful/rpc_effectful_effects.rs +++ b/node/src/rpc_effectful/rpc_effectful_effects.rs @@ -17,11 +17,10 @@ use crate::{ RpcTransactionInjectResponse, TransactionStatus, }, snark_pool::SnarkPoolAction, - stats::block_producer::BlockProductionAttemptWonSlot, transition_frontier::sync::{ ledger::TransitionFrontierSyncLedgerState, TransitionFrontierSyncState, }, - Service, State, Store, + Service, Store, }; use ledger::{ scan_state::currency::{Balance, Magnitude}, @@ -47,14 +46,6 @@ macro_rules! respond_or_log { }; } -fn get_next_won_slot(state: &State) -> Option { - let best_tip = state.transition_frontier.best_tip()?; - let cur_global_slot = state.cur_global_slot()?; - let vrf = state.block_producer.vrf_evaluator()?; - let won_slot = vrf.next_won_slot(cur_global_slot, best_tip)?; - Some((&won_slot).into()) -} - pub fn rpc_effects(store: &mut Store, action: ActionWithMeta) { let (action, meta) = action.split(); @@ -73,7 +64,10 @@ pub fn rpc_effects(store: &mut Store, action: ActionWithMeta(store: &mut Store, action: ActionWithMeta Date: Fri, 15 Nov 2024 10:13:32 -0300 Subject: [PATCH 072/175] fix(web): Don't use random hashes for names, use file contents checksums --- frontend/docker/startup.sh | 84 +++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 24 deletions(-) diff --git a/frontend/docker/startup.sh b/frontend/docker/startup.sh index 61a0882c38..3ce73c91a2 100644 --- a/frontend/docker/startup.sh +++ b/frontend/docker/startup.sh @@ -113,40 +113,76 @@ download_wasm_files() { rm "/tmp/openmina-$OPENMINA_WASM_VERSION-webnode-wasm.tar.gz" } +get_short_sha1() { + local file="$1" + if [ -z "$file" ]; then + echo "Usage: get_short_sha1 filename" >&2 + return 1 + fi + if [ ! -f "$file" ]; then + echo "Error: File not found: $file" >&2 + return 1 + fi + + if command -v sha1sum >/dev/null 2>&1; then + sha1sum "$file" | awk '{ print substr($1,1,8) }' + elif command -v openssl >/dev/null 2>&1; then + openssl sha1 "$file" | awk '{ print substr($2,1,8) }' + else + echo "Error: Neither sha1sum nor openssl is available for hashing." >&2 + return 1 + fi +} + inject_caching_logic() { - local js_file="$1" - local index_html="$2" - if [ -f "$js_file" ]; then - echo "Injecting caching logic into $js_file" + local js_file="$1" + local index_html="$2" - # Generate a unique hash - local hash=$(openssl rand -hex 8) + # Check if JavaScript file exists + if [ ! -f "$js_file" ]; then + echo "Warning: $js_file not found. Caching logic not injected." + return 0 + fi - # replace openmina_node_web_bg.wasm with openmina_node_web_bg.$hash.wasm - sed -i "s/openmina_node_web_bg.wasm/openmina_node_web_bg.$hash.wasm/g" "$js_file" + echo "Injecting caching logic into $js_file" - # add cache headers to fetch calls - sed -i 's/module_or_path = fetch(module_or_path);/module_or_path = fetch(module_or_path, { cache: "force-cache", headers: { "Cache-Control": "max-age=31536000, immutable" } });/' "$js_file" + # Define target files + local js_target_file="${TARGET_DIR}/openmina_node_web.js" + local wasm_target_file="${TARGET_DIR}/openmina_node_web_bg.wasm" - # rename openmina_node_web_bg.wasm to openmina_node_web_bg.$hash.wasm - mv "$TARGET_DIR/openmina_node_web_bg.wasm" "$TARGET_DIR/openmina_node_web_bg.$hash.wasm" + # Generate checksum hashes + local js_file_hash + js_file_hash=$(get_short_sha1 "$js_target_file") || { echo "Failed to get hash for $js_target_file"; return 1; } - # rename openmina_node_web.js to openmina_node_web.$hash.js - mv "$TARGET_DIR/openmina_node_web.js" "$TARGET_DIR/openmina_node_web.$hash.js" + local wasm_file_hash + wasm_file_hash=$(get_short_sha1 "$wasm_target_file") || { echo "Failed to get hash for $wasm_target_file"; return 1; } - # replace openmina_node_web.js with openmina_node_web.$hash.js in index.html - sed -i "s/openmina_node_web.js/openmina_node_web.$hash.js/g" "$index_html" + # Check if hashed files already exist to prevent multiple injections + local js_new_file="${TARGET_DIR}/openmina_node_web.${js_file_hash}.js" + local wasm_new_file="${TARGET_DIR}/openmina_node_web_bg.${wasm_file_hash}.wasm" - if [[ $? -ne 0 ]]; then - echo "Failed to inject caching logic into $js_file" - else - echo "Successfully injected caching logic into $js_file" + if [[ -f "$js_new_file" ]] && [[ -f "$wasm_new_file" ]]; then + echo "Hashed files already exist. Skipping caching logic injection." + return 0 fi - else - echo "Warning: $js_file not found. Caching logic not injected." - fi -} + # Replace openmina_node_web_bg.wasm with openmina_node_web_bg..wasm in JS file + sed -i "s/openmina_node_web_bg\.wasm/openmina_node_web_bg.${wasm_file_hash}.wasm/g" "$js_file" || { echo "Failed to update wasm filename in $js_file"; return 1; } + + # Add cache headers to fetch calls in JS file + sed -i 's/module_or_path = fetch(module_or_path);/module_or_path = fetch(module_or_path, { cache: "force-cache", headers: { "Cache-Control": "max-age=31536000, immutable" } });/' "$js_file" || { echo "Failed to inject cache headers into $js_file"; return 1; } + + # Rename wasm file with hash + mv "$wasm_target_file" "$wasm_new_file" || { echo "Failed to rename $wasm_target_file to $wasm_new_file"; return 1; } + + # Rename JS file with hash + mv "$js_target_file" "$js_new_file" || { echo "Failed to rename $js_target_file to $js_new_file"; return 1; } + + # Replace JS filename in index.html + sed -i "s/openmina_node_web\.js/openmina_node_web.${js_file_hash}.js/g" "$index_html" || { echo "Failed to update JS filename in $index_html"; return 1; } + + echo "Successfully injected caching logic into $js_file" +} if [ -n "$OPENMINA_FRONTEND_ENVIRONMENT" ]; then echo "Using environment: $OPENMINA_FRONTEND_ENVIRONMENT" From bc9b02552f7b8b5318794363c531219fa4923422 Mon Sep 17 00:00:00 2001 From: directcuteo <37619567+directcuteo@users.noreply.github.com> Date: Sat, 16 Nov 2024 12:08:51 +0200 Subject: [PATCH 073/175] Frontend - Firebase configuration (#913) From 18c8f5f84c6bc6ebba32f0ebfc29c2f67c96ff24 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 18 Nov 2024 11:39:34 -0300 Subject: [PATCH 074/175] fix(block-producer): Add `bug_condition!` calls --- .../block_producer/block_producer_reducer.rs | 31 ++++++++++++++++--- .../sync/transition_frontier_sync_effects.rs | 1 + 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/node/src/block_producer/block_producer_reducer.rs b/node/src/block_producer/block_producer_reducer.rs index 4c3165cb27..3332e8b1ce 100644 --- a/node/src/block_producer/block_producer_reducer.rs +++ b/node/src/block_producer/block_producer_reducer.rs @@ -134,6 +134,7 @@ impl BlockProducerEnabled { won_slot, chain, .. } = &mut state.current else { + bug_condition!("Invalid state for `BlockProducerAction::WonSlotTransactionsGet` expected: `BlockProducerCurrentState::WonSlotProduceInit`, found: {:?}", state.current); return; }; @@ -153,6 +154,7 @@ impl BlockProducerEnabled { won_slot, chain, .. } = &mut state.current else { + bug_condition!("Invalid state for `BlockProducerAction::WonSlotTransactionsSuccess` expected: `BlockProducerCurrentState::WonSlotTransactionsGet`, found: {:?}", state.current); return; }; @@ -178,6 +180,7 @@ impl BlockProducerEnabled { .. } = &mut state.current else { + bug_condition!("Invalid state for `BlockProducerAction::StagedLedgerDiffCreatePending` expected: `BlockProducerCurrentState::WonSlotTransactionsSuccess`, found: {:?}", state.current); return; }; state.current = BlockProducerCurrentState::StagedLedgerDiffCreatePending { @@ -194,6 +197,7 @@ impl BlockProducerEnabled { .. } = &mut state.current else { + bug_condition!("Invalid state for `BlockProducerAction::StagedLedgerDiffCreateSuccess` expected: `BlockProducerCurrentState::StagedLedgerDiffCreatePending`, found: {:?}", state.current); return; }; state.current = BlockProducerCurrentState::StagedLedgerDiffCreateSuccess { @@ -223,6 +227,8 @@ impl BlockProducerEnabled { dispatcher.push(BlockProducerEffectfulAction::BlockProveInit); } BlockProducerAction::BlockProvePending => { + let current_state = std::mem::take(&mut state.current); + if let BlockProducerCurrentState::BlockUnprovenBuilt { won_slot, chain, @@ -233,7 +239,7 @@ impl BlockProducerEnabled { block, block_hash, .. - } = std::mem::take(&mut state.current) + } = current_state { state.current = BlockProducerCurrentState::BlockProvePending { time: meta.time(), @@ -246,16 +252,20 @@ impl BlockProducerEnabled { block, block_hash, }; + } else { + bug_condition!("Invalid state for `BlockProducerAction::BlockProvePending` expected: `BlockProducerCurrentState::BlockUnprovenBuilt`, found: {:?}", current_state); } } BlockProducerAction::BlockProveSuccess { proof } => { + let current_state = std::mem::take(&mut state.current); + if let BlockProducerCurrentState::BlockProvePending { won_slot, chain, block, block_hash, .. - } = std::mem::take(&mut state.current) + } = current_state { state.current = BlockProducerCurrentState::BlockProveSuccess { time: meta.time(), @@ -265,12 +275,16 @@ impl BlockProducerEnabled { block_hash, proof: proof.clone(), }; + } else { + bug_condition!("Invalid state for `BlockProducerAction::BlockProveSuccess` expected: `BlockProducerCurrentState::BlockProvePending`, found: {:?}", current_state); } let dispatcher = state_context.into_dispatcher(); dispatcher.push(BlockProducerEffectfulAction::BlockProveSuccess); } BlockProducerAction::BlockProduced => { + let current_state = std::mem::take(&mut state.current); + if let BlockProducerCurrentState::BlockProveSuccess { won_slot, chain, @@ -278,7 +292,7 @@ impl BlockProducerEnabled { block_hash, proof, .. - } = std::mem::take(&mut state.current) + } = current_state { state.current = BlockProducerCurrentState::Produced { time: meta.time(), @@ -286,6 +300,8 @@ impl BlockProducerEnabled { chain, block: block.with_hash_and_proof(block_hash, *proof), }; + } else { + bug_condition!("Invalid state for `BlockProducerAction::BlockProduced` expected: `BlockProducerCurrentState::BlockProveSuccess`, found: {:?}", current_state); } let dispatcher = state_context.into_dispatcher(); @@ -301,6 +317,7 @@ impl BlockProducerEnabled { let blocks_inbetween = iter.map(|b| b.hash().clone()).collect(); Some((best_tip.clone(), root_block.clone(), blocks_inbetween)) }) else { + bug_condition!("Invalid state for `BlockProducerAction::BlockInject`: did not find best_tip/root_block in block producer"); return; }; @@ -336,6 +353,8 @@ impl BlockProducerEnabled { chain: std::mem::take(chain), block: block.clone(), }; + } else { + bug_condition!("Invalid state for `BlockProducerAction::BlockInjected` expected: `BlockProducerCurrentState::Produced`, found: {:?}", state.current); } let dispatcher = state_context.into_dispatcher(); @@ -349,6 +368,8 @@ impl BlockProducerEnabled { consensus_constants: &ConsensusConstants, time: Timestamp, ) { + let current_state = std::mem::take(&mut self.current); + let BlockProducerCurrentState::StagedLedgerDiffCreateSuccess { won_slot, chain, @@ -360,11 +381,13 @@ impl BlockProducerEnabled { pending_coinbase_witness, stake_proof_sparse_ledger, .. - } = std::mem::take(&mut self.current) + } = current_state else { + bug_condition!("Invalid state for `BlockProducerAction::BlockUnprovenBuild` expected: `BlockProducerCurrentState::StagedLedgerDiffCreateSuccess`, found: {:?}", current_state); return; }; let Some(pred_block) = chain.last() else { + bug_condition!("Invalid state for `BlockProducerAction::BlockUnprovenBuild`: did not find predecessor block"); return; }; diff --git a/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs b/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs index e121f1ab44..50b802aa5d 100644 --- a/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs +++ b/node/src/transition_frontier/sync/transition_frontier_sync_effects.rs @@ -249,6 +249,7 @@ impl TransitionFrontierSyncAction { // During catchup, we skip the verificationf of completed work and zkApp txn proofs // until get closer to the best tip, at which point full verification is enabled. + // TODO(tizoc): locally produced blocks shouldn't be verified either let skip_verification = super::CATCHUP_BLOCK_VERIFY_TAIL_LENGTH < store.state().transition_frontier.sync.pending_count(); From 8a4ea3ec1c43cf577b2eed587f52bc20ca8f647e Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 18 Nov 2024 17:36:15 +0200 Subject: [PATCH 075/175] Frontend - Firebase Caching --- README.md | 4 +- frontend/firebase.json | 18 ++++ frontend/package.json | 8 +- frontend/scripts/download-webnode.sh | 2 +- frontend/scripts/update-frontend-version.js | 56 ++++++++++++ frontend/scripts/update-webnode-version.js | 21 ----- frontend/src/app/app.component.ts | 14 +-- frontend/src/app/app.effects.ts | 3 + frontend/src/app/app.module.ts | 2 + frontend/src/app/app.reducer.ts | 3 + frontend/src/app/app.service.ts | 38 +++++++- .../src/app/core/services/web-node.service.ts | 86 +++++++++---------- .../block-production-won-slots.effects.ts | 6 +- .../block-production-won-slots.service.ts | 2 +- .../web-node-initialization.component.ts | 10 +++ .../block-production-pill.component.html | 12 +++ .../block-production-pill.component.scss | 58 +++++++++++++ .../block-production-pill.component.ts | 74 ++++++++++++++++ .../server-status.component.html | 2 +- .../app/layout/toolbar/toolbar.component.html | 3 +- .../src/app/shared/helpers/date.helper.ts | 33 ++++++- .../shared/types/app/app-node-details.type.ts | 5 ++ frontend/src/environments/environment.ts | 55 ++++++------ frontend/src/index.html | 20 +++-- 24 files changed, 418 insertions(+), 117 deletions(-) create mode 100644 frontend/scripts/update-frontend-version.js delete mode 100644 frontend/scripts/update-webnode-version.js create mode 100644 frontend/src/app/layout/block-production-pill/block-production-pill.component.html create mode 100644 frontend/src/app/layout/block-production-pill/block-production-pill.component.scss create mode 100644 frontend/src/app/layout/block-production-pill/block-production-pill.component.ts diff --git a/README.md b/README.md index 6972671913..3635ad7220 100644 --- a/README.md +++ b/README.md @@ -191,10 +191,10 @@ nvm install 20.11.1 Download [Node.js v20.11.1](https://nodejs.org/) from the official website, open the installer and follow the prompts to complete the installation. -### 2. Angular CLI v16.2.0 +### 2. Angular CLI v17.3.0 ```bash -npm install -g @angular/cli@16.2.0 +npm install -g @angular/cli@17.3.0 ``` ### 3. Installation diff --git a/frontend/firebase.json b/frontend/firebase.json index 7c5ecc4125..314966c493 100644 --- a/frontend/firebase.json +++ b/frontend/firebase.json @@ -34,6 +34,24 @@ "value": "require-corp" } ] + }, + { + "source": "**/*.@(js|wasm|html)", + "headers": [ + { + "key": "Cache-Control", + "value": "no-cache, no-store, must-revalidate" + } + ] + }, + { + "source": "/", + "headers": [ + { + "key": "Cache-Control", + "value": "no-cache, no-store, must-revalidate" + } + ] } ] } diff --git a/frontend/package.json b/frontend/package.json index 549ac8d225..494a0fab4f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "0.8.20", + "version": "1.0.16", "scripts": { "install:deps": "npm install", "start": "npm install && ng serve --configuration local --open", @@ -12,14 +12,14 @@ "tests:headless": "npx cypress run --headless --config baseUrl=http://localhost:4200", "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t openmina/frontend:latest . && docker push openmina/frontend:latest", "start:bundle": "npx http-server dist/frontend -p 4200", - "prebuild": "node scripts/update-webnode-version.js", + "prebuild": "node scripts/update-frontend-version.js", "dev:ssr": "ng run frontend:serve-ssr", "serve:ssr": "node dist/frontend/server/main.js", "build:ssr": "ng build && ng run frontend:server", "prerender": "ng run frontend:prerender", "sentry:sourcemaps": "sentry-cli sourcemaps inject --org openmina-uv --project openmina ./dist/frontend/browser && sentry-cli sourcemaps upload --org openmina-uv --project openmina ./dist/frontend/browser", "copy-env": "cp dist/frontend/browser/assets/environments/webnode.js dist/frontend/browser/assets/environments/env.js", - "deploy": "npm run build:prod && npm run copy-env && firebase deploy" + "deploy": "npm run prebuild && npm run build:prod && npm run copy-env && firebase deploy" }, "private": true, "dependencies": { @@ -86,4 +86,4 @@ "webpack": "^5.88.2", "webpack-bundle-analyzer": "^4.9.0" } -} +} \ No newline at end of file diff --git a/frontend/scripts/download-webnode.sh b/frontend/scripts/download-webnode.sh index 791aa0103b..619cc97347 100644 --- a/frontend/scripts/download-webnode.sh +++ b/frontend/scripts/download-webnode.sh @@ -36,7 +36,7 @@ download_circuit_files() { "wrap-wrap-proving-key-transaction-snark-b9a01295c8cc9bda6d12142a581cd305_internal_vars.bin" "wrap-wrap-proving-key-transaction-snark-b9a01295c8cc9bda6d12142a581cd305_rows_rev.bin" ) - DOWNLOAD_DIR="/Users/teofil/teo/mina/openmina/frontend/dist/frontend/browser/assets/webnode/circuit-blobs/$CIRCUITS_VERSION" + DOWNLOAD_DIR="../src/assets/webnode/circuit-blobs/$CIRCUITS_VERSION" mkdir -p "$DOWNLOAD_DIR" diff --git a/frontend/scripts/update-frontend-version.js b/frontend/scripts/update-frontend-version.js new file mode 100644 index 0000000000..a186a2cc50 --- /dev/null +++ b/frontend/scripts/update-frontend-version.js @@ -0,0 +1,56 @@ +import {readFileSync, writeFileSync} from 'fs'; +import {platform, release} from 'os'; + +console.log('⏳ Updating Deployment Info...'); + +const packageJsonPath = './package.json'; +const packageJson = readFileSync(packageJsonPath, 'utf8'); +const packageJsonObj = JSON.parse(packageJson); +const version = packageJsonObj.version.split('.'); +const newVersion = `${version[0]}.${version[1]}.${parseInt(version[2]) + 1}`; +packageJsonObj.version = newVersion; +writeFileSync(packageJsonPath, JSON.stringify(packageJsonObj, null, 2)); + +const publicIp = await getPublicIpAddress(); +const deploymentInfo = { + dateUTC: new Date().toISOString(), + deviceIp: publicIp, + deviceOS: formatOS(platform()), + deviceOSVersion: release(), + version: newVersion, +}; + +const newDeploymentScript = ` +const deployment = { + dateUTC: '${deploymentInfo.dateUTC}', + deviceIp: '${deploymentInfo.deviceIp}', + deviceOS: '${deploymentInfo.deviceOS}', + deviceOSVersion: '${deploymentInfo.deviceOSVersion}', + version: '${deploymentInfo.version}', +}; +window.deployment = deployment; +`; +const deploymentScriptPattern = /const deployment = \{[\s\S]*?\};[\s\S]*?window\.deployment = deployment;/; + +// Read and update index.html +const indexPath = './src/index.html'; +let indexHtml = readFileSync(indexPath, 'utf8'); +indexHtml = indexHtml.replace(deploymentScriptPattern, newDeploymentScript.trim()); + +writeFileSync(indexPath, indexHtml); + +console.log('✅ Updated Deployment Info!'); + +async function getPublicIpAddress() { + const response = await fetch('https://api.ipify.org/'); + return await response.text(); +} + +function formatOS(platform) { + const osMap = { + 'darwin': 'macOS', + 'win32': 'Windows', + 'linux': 'Linux', + }; + return osMap[platform] || platform; +} diff --git a/frontend/scripts/update-webnode-version.js b/frontend/scripts/update-webnode-version.js deleted file mode 100644 index 8e18ab29dc..0000000000 --- a/frontend/scripts/update-webnode-version.js +++ /dev/null @@ -1,21 +0,0 @@ -const fs = require('fs'); -const crypto = require('crypto'); - -// Generate a random hash -const hash = crypto.randomBytes(16).toString('hex'); // Generates a 32-character random hex string - -// Read and update index.html -const indexPath = './src/index.html'; -let indexHtml = fs.readFileSync(indexPath, 'utf8'); - -// Enhanced Regex Pattern -// Match 'const WEBNODE_VERSION = ' with optional whitespace around the equals and between quotes -const versionRegex = /const\s+WEBNODE_VERSION\s*=\s*['"][^'"]*['"];/; - -// Perform replacement -indexHtml = indexHtml.replace(versionRegex, `const WEBNODE_VERSION = '${hash}';`); - -// Write updated content to index.html -fs.writeFileSync(indexPath, indexHtml); - -console.log(`Updated WEBNODE_VERSION in ${indexPath} to ${hash}`); diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 8fd2baaa6e..4651b06105 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { any, getMergedRoute, getWindow, MAX_WIDTH_700, MergedRoute, safelyExecuteInBrowser } from '@openmina/shared'; +import { any, getMergedRoute, getWindow, isBrowser, MAX_WIDTH_700, MergedRoute, safelyExecuteInBrowser } from '@openmina/shared'; import { AppMenu } from '@shared/types/app/app-menu.type'; import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout'; import { AppSelectors } from '@app/app.state'; @@ -38,14 +38,16 @@ export class AppComponent extends StoreDispatcher implements OnInit { any(window).config = CONFIG; any(window).store = this.store; } - }) + }); } ngOnInit(): void { - const args = new URLSearchParams(window.location.search).get("a"); - if (!!args) { - window.localStorage.setItem("webnodeArgs", args); - } + if (isBrowser()) { + const args = new URLSearchParams(window.location.search).get('a'); + if (!!args) { + localStorage.setItem('webnodeArgs', args); + } + } this.select( getMergedRoute, diff --git a/frontend/src/app/app.effects.ts b/frontend/src/app/app.effects.ts index 4c4539d715..e5b86fc7e3 100644 --- a/frontend/src/app/app.effects.ts +++ b/frontend/src/app/app.effects.ts @@ -101,6 +101,9 @@ export class AppEffects extends BaseEffect { upload: 0, transactions: 0, snarks: 0, + producingBlockAt: null, + producingBlockGlobalSlot: null, + producingBlockStatus: null, }, })), )); diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 127d67b90b..0f4bb15523 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -39,6 +39,7 @@ import { Router } from '@angular/router'; import { initializeApp, provideFirebaseApp } from '@angular/fire/app'; import { getAnalytics, provideAnalytics, ScreenTrackingService } from '@angular/fire/analytics'; import { getPerformance, providePerformance } from '@angular/fire/performance'; +import { BlockProductionPillComponent } from '@app/layout/block-production-pill/block-production-pill.component'; registerLocaleData(localeFr, 'fr'); registerLocaleData(localeEn, 'en'); @@ -159,6 +160,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { ReactiveFormsModule, CopyComponent, WebNodeLandingPageComponent, + BlockProductionPillComponent, ], providers: [ THEME_PROVIDER, diff --git a/frontend/src/app/app.reducer.ts b/frontend/src/app/app.reducer.ts index 8621f3b53a..93014aecf2 100644 --- a/frontend/src/app/app.reducer.ts +++ b/frontend/src/app/app.reducer.ts @@ -22,6 +22,9 @@ const initialState: AppState = { upload: 0, transactions: 0, snarks: 0, + producingBlockAt: null, + producingBlockGlobalSlot: null, + producingBlockStatus: null, }, }; diff --git a/frontend/src/app/app.service.ts b/frontend/src/app/app.service.ts index 829e0753e9..dd8bc34df1 100644 --- a/frontend/src/app/app.service.ts +++ b/frontend/src/app/app.service.ts @@ -5,7 +5,8 @@ import { CONFIG } from '@shared/constants/config'; import { RustService } from '@core/services/rust.service'; import { AppNodeDetails, AppNodeStatus } from '@shared/types/app/app-node-details.type'; import { getNetwork } from '@shared/helpers/mina.helper'; -import { getLocalStorage } from '@openmina/shared'; +import { getLocalStorage, ONE_MILLION } from '@openmina/shared'; +import { BlockProductionWonSlotsStatus } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; @Injectable({ providedIn: 'root', @@ -31,7 +32,7 @@ export class AppService { getActiveNodeDetails(): Observable { return this.rust.get('/status') .pipe( - map((data: NodeDetailsResponse) => ({ + map((data: NodeDetailsResponse): AppNodeDetails => ({ status: this.getStatus(data), blockHeight: data.transition_frontier.best_tip?.height, blockTime: data.transition_frontier.sync.time, @@ -42,6 +43,9 @@ export class AppService { transactions: data.transaction_pool.transactions, chainId: data.chain_id, network: getNetwork(data.chain_id), + producingBlockAt: data.current_block_production_attempt?.won_slot.slot_time / ONE_MILLION, + producingBlockGlobalSlot: data.current_block_production_attempt?.won_slot.global_slot, + producingBlockStatus: data.current_block_production_attempt?.status, } as AppNodeDetails)), ); } @@ -66,8 +70,38 @@ export interface NodeDetailsResponse { peers: Peer[]; snark_pool: SnarkPool; chain_id: string | undefined; + current_block_production_attempt: BlockProductionAttempt; } +export interface BlockProductionAttempt { + won_slot: WonSlot; + block: any; + times: Times; + status: BlockProductionWonSlotsStatus; +} + +export interface WonSlot { + slot_time: number; + global_slot: number; + epoch: number; + delegator: [string, number]; + value_with_threshold: number[]; +} + +export interface Times { + scheduled: number; + staged_ledger_diff_create_start: any; + staged_ledger_diff_create_end: any; + produced: any; + proof_create_start: any; + proof_create_end: any; + block_apply_start: any; + block_apply_end: any; + committed: any; + discarded: any; +} + + interface TransitionFrontier { best_tip: BestTip; sync: Sync; diff --git a/frontend/src/app/core/services/web-node.service.ts b/frontend/src/app/core/services/web-node.service.ts index c072096286..5deec9a9a7 100644 --- a/frontend/src/app/core/services/web-node.service.ts +++ b/frontend/src/app/core/services/web-node.service.ts @@ -47,29 +47,29 @@ export class WebNodeService { loadWasm$(): Observable { this.webNodeStartTime = Date.now(); - const args = (() => { - const raw = window.localStorage.getItem("webnodeArgs"); - if (raw == null) { - return null; - } - return JSON.parse(atob(raw)); - })(); if (isBrowser()) { + const args = (() => { + const raw = localStorage.getItem('webnodeArgs'); + if (raw === null) { + return null; + } + return JSON.parse(atob(raw)); + })(); return merge( of(any(window).webnode).pipe(filter(Boolean)), fromEvent(window, 'webNodeLoaded'), ).pipe( switchMap(() => { - const DEFAULT_NETWORK = "devnet"; + const DEFAULT_NETWORK = 'devnet'; if (!args) { return this.http.get<{ publicKey: string, privateKey: string }>('assets/webnode/web-node-secrets.json') - .pipe(map(blockProducer => ({blockProducer, network: DEFAULT_NETWORK}))); + .pipe(map(blockProducer => ({ blockProducer, network: DEFAULT_NETWORK }))); } - const data = { network: args["network"] || DEFAULT_NETWORK, blockProducer: {} as any }; - if (!!args["block_producer"]) { - data["blockProducer"] = { - privateKey: args["block_producer"].sec_key, - publicKey: args["block_producer"].pub_key, + const data = { network: args['network'] || DEFAULT_NETWORK, blockProducer: {} as any }; + if (!!args['block_producer']) { + data['blockProducer'] = { + privateKey: args['block_producer'].sec_key, + publicKey: args['block_producer'].pub_key, }; } return of(data); @@ -87,36 +87,36 @@ export class WebNodeService { startWasm$(): Observable { if (isBrowser()) { return of(any(window).webnode) - .pipe( - switchMap((wasm: any) => from(wasm.default(undefined, new WebAssembly.Memory(this.memory))).pipe(map(() => wasm))), - switchMap((wasm) => { - this.webnodeProgress$.next('Loaded'); - const urls = (() => { - if (typeof this.webNodeNetwork == 'number') { - const url = `${window.location.origin}/clusters/${this.webNodeNetwork}/`; - return { - seeds: url + 'seeds', - genesisConfig: url + 'genesis/config' + .pipe( + switchMap((wasm: any) => from(wasm.default(undefined, new WebAssembly.Memory(this.memory))).pipe(map(() => wasm))), + switchMap((wasm) => { + this.webnodeProgress$.next('Loaded'); + const urls = (() => { + if (typeof this.webNodeNetwork === 'number') { + const url = `${window.location.origin}/clusters/${this.webNodeNetwork}/`; + return { + seeds: url + 'seeds', + genesisConfig: url + 'genesis/config', + }; + } else { + return {}; } - } else { - return {}; - } - })(); - console.log("webnode config:", !!this.webNodeKeyPair.privateKey, this.webNodeNetwork, urls); - return from(wasm.run(this.webNodeKeyPair.privateKey, urls.seeds, urls.genesisConfig)); - }), - tap((webnode: any) => { - any(window)['webnode'] = webnode; - this.webnode$.next(webnode); - this.webnodeProgress$.next('Started'); - }), - catchError((error) => { - sendSentryEvent('WebNode failed to start: ' + error.message); - return throwError(() => new Error(error.message)); - }), - switchMap(() => this.webnode$.asObservable()), - filter(Boolean), - ); + })(); + console.log('webnode config:', !!this.webNodeKeyPair.privateKey, this.webNodeNetwork, urls); + return from(wasm.run(this.webNodeKeyPair.privateKey, urls.seeds, urls.genesisConfig)); + }), + tap((webnode: any) => { + any(window)['webnode'] = webnode; + this.webnode$.next(webnode); + this.webnodeProgress$.next('Started'); + }), + catchError((error) => { + sendSentryEvent('WebNode failed to start: ' + error.message); + return throwError(() => new Error(error.message)); + }), + switchMap(() => this.webnode$.asObservable()), + filter(Boolean), + ); } return EMPTY; } diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts index ab027cf104..4cf0d04495 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts @@ -57,7 +57,11 @@ export class BlockProductionWonSlotsEffects extends BaseEffect { ?? null; } const routes: string[] = [Routes.BLOCK_PRODUCTION, Routes.WON_SLOTS]; - if (newActiveSlot && isDesktop() || (activeSlotRoute && !bpState.activeSlot) || (activeSlotRoute && bpState.openSidePanel)) { + if ( + newActiveSlot && isDesktop() + || (activeSlotRoute && !bpState.activeSlot) + || (activeSlotRoute && bpState.openSidePanel) + ) { routes.push(newActiveSlot.globalSlot.toString()); } return fromPromise(this.router.navigate(routes, { queryParamsHandling: 'merge' })).pipe(map(() => ({ diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts index fb6e7bfbab..3fd23cc33b 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts @@ -14,7 +14,7 @@ import { } from '@shared/types/block-production/won-slots/block-production-won-slots-epoch.type'; @Injectable({ - providedIn: BlockProductionModule, + providedIn: 'root', }) export class BlockProductionWonSlotsService { diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts index be3bf550ba..1c526a6950 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts @@ -80,6 +80,14 @@ export class WebNodeInitializationComponent extends StoreDispatcher implements O window.dispatchEvent(new CustomEvent('startWebNode')); }); this.stepsPercentages = this.getStepPercentages(); + if (this.webNodeService.isWebNodeLoaded()) { + this.loading.forEach((step: WebNodeLoadingStep) => { + step.loaded = true; + step.status = WebNodeStepStatus.DONE; + }); + this.ready = true; + return; + } this.fetchProgress(); this.listenToErrorIssuing(); this.checkWebNodeProgress(); @@ -197,6 +205,7 @@ export class WebNodeInitializationComponent extends StoreDispatcher implements O clearInterval(interval); } }, 30); + setTimeout(() => this.detect(), 500); } private fetchPeersInformation(): void { @@ -326,6 +335,7 @@ export class WebNodeInitializationComponent extends StoreDispatcher implements O this.ready = true; newProgress = 100; this.detect(); + setTimeout(() => this.detect(), 500); } this.progress = newProgress; this.arc.endAngle(Math.PI * 2 * (newProgress / 100)); diff --git a/frontend/src/app/layout/block-production-pill/block-production-pill.component.html b/frontend/src/app/layout/block-production-pill/block-production-pill.component.html new file mode 100644 index 0000000000..6073d1e688 --- /dev/null +++ b/frontend/src/app/layout/block-production-pill/block-production-pill.component.html @@ -0,0 +1,12 @@ +
+
+ schedule +
Block Production 
+
+ @if (text) { + {{ text }} + } @else { + {{ producingIn ? ('in ' + producingIn) : 'in ...' }} + }
+
+
diff --git a/frontend/src/app/layout/block-production-pill/block-production-pill.component.scss b/frontend/src/app/layout/block-production-pill/block-production-pill.component.scss new file mode 100644 index 0000000000..ae1d52e03f --- /dev/null +++ b/frontend/src/app/layout/block-production-pill/block-production-pill.component.scss @@ -0,0 +1,58 @@ +@import 'openmina'; + +$blue: #57d7ff; +$pink: #fda2ff; +$orange: #ff833d; + +:host { + min-width: 170px; + background-image: linear-gradient(25deg, rgba($blue, 0.8), rgba($pink, 0.8), rgba($orange, 0.8)); + padding: 1px; + $h-sm: 24px; + height: calc($h-sm - 2px); + @media (max-width: 768px) { + $h-sm: 32px; + height: calc($h-sm - 2px); + } + + &.hidden { + min-width: 0; + max-width: 0; + padding: 0; + + > * { + display: none; + } + } +} + +.pill { + background-color: $base-background; + height: 100%; + + .pill-inside { + padding-left: 3px; + background: linear-gradient(25deg, rgba($blue, 0.2), rgba($pink, 0.2), rgba($orange, 0.2)); + + .mina-icon, + .bp, + .time { + background: linear-gradient(12deg, $blue, $pink, $orange); + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; + } + + &:hover { + .mina-icon, + .bp, + .time { + background: linear-gradient(100deg, $blue, $pink, $orange); + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; + } + } + } + +} diff --git a/frontend/src/app/layout/block-production-pill/block-production-pill.component.ts b/frontend/src/app/layout/block-production-pill/block-production-pill.component.ts new file mode 100644 index 0000000000..2e460cbf11 --- /dev/null +++ b/frontend/src/app/layout/block-production-pill/block-production-pill.component.ts @@ -0,0 +1,74 @@ +import { ChangeDetectionStrategy, Component, HostBinding, OnDestroy, OnInit } from '@angular/core'; +import { AppSelectors } from '@app/app.state'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { AppNodeDetails } from '@shared/types/app/app-node-details.type'; +import { getTimeDiff } from '@shared/helpers/date.helper'; +import { Router } from '@angular/router'; +import { Routes } from '@shared/enums/routes.enum'; +import { BlockProductionWonSlotsStatus } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; +import { filter } from 'rxjs'; +import { isFeatureEnabled, isSubFeatureEnabled } from '@shared/constants/config'; + +@Component({ + selector: 'mina-block-production-pill', + standalone: true, + imports: [], + templateUrl: './block-production-pill.component.html', + styleUrl: './block-production-pill.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'mr-8 border-rad-6' }, +}) +export class BlockProductionPillComponent extends StoreDispatcher implements OnInit, OnDestroy { + text: string = null; + producingIn: string = null; + + private globalSlot: number = null; + private interval: any; + private producingValue: number = null; + + @HostBinding('class.hidden') private hideComponent = false; + + constructor(private router: Router) { super(); } + + ngOnInit(): void { + this.listenToActiveNode(); + } + + private listenToActiveNode(): void { + this.select(AppSelectors.activeNode, (node) => { + this.hideComponent = !isSubFeatureEnabled(node, 'block-production', 'won-slots'); + }); + this.select(AppSelectors.activeNodeDetails, (details: AppNodeDetails) => { + if (details.producingBlockStatus === BlockProductionWonSlotsStatus.Committed) { + this.text = 'active'; + } else if (details.producingBlockStatus === BlockProductionWonSlotsStatus.Produced) { + this.text = 'done'; + } else { + this.text = null; + } + this.globalSlot = details.producingBlockGlobalSlot; + this.producingValue = details.producingBlockAt; + this.producingIn = getTimeDiff(this.producingValue, { only1unit: true }).diff; + this.detect(); + }, filter((details: AppNodeDetails) => !!details)); + } + + private clearInterval(): void { + if (this.interval) { + clearInterval(this.interval); + this.interval = null; + } + } + + goToWonSlots(): void { + if (!this.globalSlot) { + return; + } + this.router.navigate([Routes.BLOCK_PRODUCTION, Routes.WON_SLOTS, this.globalSlot], { queryParamsHandling: 'merge' }); + } + + override ngOnDestroy(): void { + super.ngOnDestroy(); + this.clearInterval(); + } +} diff --git a/frontend/src/app/layout/server-status/server-status.component.html b/frontend/src/app/layout/server-status/server-status.component.html index a9b01e4f38..f5baafde0b 100644 --- a/frontend/src/app/layout/server-status/server-status.component.html +++ b/frontend/src/app/layout/server-status/server-status.component.html @@ -23,7 +23,7 @@ }
-
diff --git a/frontend/src/app/layout/toolbar/toolbar.component.html b/frontend/src/app/layout/toolbar/toolbar.component.html index 9d2980871f..16072ce2b9 100644 --- a/frontend/src/app/layout/toolbar/toolbar.component.html +++ b/frontend/src/app/layout/toolbar/toolbar.component.html @@ -10,7 +10,8 @@
- + +
diff --git a/frontend/src/app/shared/helpers/date.helper.ts b/frontend/src/app/shared/helpers/date.helper.ts index cf11804011..e481923184 100644 --- a/frontend/src/app/shared/helpers/date.helper.ts +++ b/frontend/src/app/shared/helpers/date.helper.ts @@ -6,7 +6,7 @@ import { ONE_THOUSAND } from '@openmina/shared'; * @param time * @param config - withSecs: boolean, fromTime: number */ -export function getTimeDiff(time: number, config?: { withSecs: boolean, fromTime?: number }): { +export function getTimeDiff(time: number, config?: { withSecs?: boolean, only1unit?: boolean, fromTime?: number }): { diff: string, inFuture: boolean } { @@ -36,6 +36,23 @@ export function getTimeDiff(time: number, config?: { withSecs: boolean, fromTime const seconds = Math.floor(timeDifference / 1000); let timeAgo = ''; + + if (config?.only1unit) { + if (days > 0) { + timeAgo += `${days}d `; + } else if (hours > 0) { + timeAgo += `${hours}h `; + } else if (minutes > 0) { + timeAgo += `${minutes}m `; + } else { + if (config?.withSecs) { + timeAgo += `${seconds}s `; + } else { + timeAgo = '<1m '; + } + } + return { diff: timeAgo.trim(), inFuture }; + } if (days > 0) { timeAgo += `${days}d `; } @@ -57,3 +74,17 @@ export function getTimeDiff(time: number, config?: { withSecs: boolean, fromTime return { diff: timeAgo.trim(), inFuture }; } + +export function getSecondsDiff(time: number, config?: { fromTime?: number }): number { + if (!time) { + return 0; + } + if (time.toString().length === 10) { + time *= ONE_THOUSAND; + } + + const paramTime = new Date(time).getTime(); + const currentTime = config?.fromTime ? new Date(config.fromTime).getTime() : Date.now(); + + return Math.floor((paramTime - currentTime) / 1000); +} diff --git a/frontend/src/app/shared/types/app/app-node-details.type.ts b/frontend/src/app/shared/types/app/app-node-details.type.ts index eeb87cab61..fc6efd093e 100644 --- a/frontend/src/app/shared/types/app/app-node-details.type.ts +++ b/frontend/src/app/shared/types/app/app-node-details.type.ts @@ -1,4 +1,5 @@ import { MinaNetwork } from '@shared/types/core/mina/mina.type'; +import { BlockProductionWonSlotsStatus } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; export interface AppNodeDetails { status: AppNodeStatus; @@ -12,6 +13,10 @@ export interface AppNodeDetails { transactions: number; snarks: number; + producingBlockAt: number; + producingBlockGlobalSlot: number; + producingBlockStatus: BlockProductionWonSlotsStatus; + chainId?: string; network?: MinaNetwork; } diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index c7e94f9576..d0445cd6a3 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment: Readonly = { production: false, identifier: 'Dev FE', canAddNodes: true, - showWebNodeLandingPage: true, + // showWebNodeLandingPage: true, globalConfig: { features: { dashboard: [], @@ -39,35 +39,34 @@ export const environment: Readonly = { // name: 'Producer-2', // url: 'https://staging-devnet-openmina-bp-2-dashboard.minaprotocol.network', // }, - // { - // name: 'staging-devnet-bp-0', - // url: 'https://staging-devnet-openmina-bp-0.minaprotocol.network', - // }, - // { - // name: 'staging-devnet-bp-1', - // url: 'https://staging-devnet-openmina-bp-1.minaprotocol.network', - // }, - // { - // name: 'staging-devnet-bp-2', - // url: 'https://staging-devnet-openmina-bp-2.minaprotocol.network', - // }, - // { - // name: 'staging-devnet-bp-3', - // url: 'https://staging-devnet-openmina-bp-3.minaprotocol.network', - // }, { - name: 'Web Node 1', - isWebNode: true, + name: 'staging-devnet-bp-0', + url: 'https://staging-devnet-openmina-bp-0.minaprotocol.network', + }, + { + name: 'staging-devnet-bp-1', + url: 'https://staging-devnet-openmina-bp-1.minaprotocol.network', + }, + { + name: 'staging-devnet-bp-2', + url: 'https://staging-devnet-openmina-bp-2.minaprotocol.network', + }, + { + name: 'staging-devnet-bp-3', + url: 'https://staging-devnet-openmina-bp-3.minaprotocol.network', }, // { - // name: 'http://65.109.105.40:3000', - // url: 'http://65.109.105.40:3000', + // name: 'Web Node 1', + // isWebNode: true, // }, // { - // name: 'Local rust node', - // url: 'http://127.0.0.1:3000', - // memoryProfiler: 'http://1.k8.openmina.com:31164', + // name: 'http://65.109.105.40:3000', + // url: 'http://65.109.105.40:3000', // }, + { + name: 'Local rust node', + url: 'http://127.0.0.1:3000', + }, // { // name: 'feat/frontend-api-peers', // url: 'http://176.9.147.28:3000', @@ -79,10 +78,10 @@ export const environment: Readonly = { // resources: ['memory'], // }, // }, - // { - // name: 'Docker 11010', - // url: 'http://localhost:11010', - // }, + { + name: 'Docker 11010', + url: 'http://localhost:11010', + }, // { // name: 'Docker 11012', // url: 'http://localhost:11012', diff --git a/frontend/src/index.html b/frontend/src/index.html index b216014a4c..111a43de5d 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -28,11 +28,11 @@ - - - - - + + + + + Open Mina @@ -52,6 +52,16 @@ + From 09c6c106af56d3c95c397e8dbee1e864128c05a4 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Wed, 20 Nov 2024 02:11:39 +0400 Subject: [PATCH 080/175] fix(node): requesting data from peer which doesnt have it --- node/src/effects.rs | 22 +++++- ...ion_frontier_sync_ledger_staged_actions.rs | 5 +- ...ion_frontier_sync_ledger_staged_reducer.rs | 73 ++++++++++++++++--- ...ition_frontier_sync_ledger_staged_state.rs | 13 ---- p2p/src/p2p_state.rs | 5 +- 5 files changed, 88 insertions(+), 30 deletions(-) diff --git a/node/src/effects.rs b/node/src/effects.rs index 8aad7a94ab..a8a9a28e24 100644 --- a/node/src/effects.rs +++ b/node/src/effects.rs @@ -126,10 +126,28 @@ fn p2p_request_best_tip_if_needed(store: &mut Store) { } use mina_p2p_messages::v2::StateHash; -fn request_best_tip(store: &mut Store, _consensus_best_tip_hash: Option) { +fn request_best_tip(store: &mut Store, consensus_best_tip_hash: Option) { let p2p = p2p_ready!(store.state().p2p, "request_best_tip", system_time()); - let peers = p2p.ready_rpc_peers_iter().collect::>(); + let (ready_peers, ready_peers_matching_best_tip) = p2p.ready_rpc_peers_iter().fold( + (Vec::new(), Vec::new()), + |(mut all, mut matching), (peer_id, peer)| { + let rpc_id = peer.channels.next_local_rpc_id(); + if peer.best_tip.as_ref().map(|b| b.hash()) == consensus_best_tip_hash.as_ref() { + matching.push((*peer_id, rpc_id)); + } else if matching.is_empty() { + all.push((*peer_id, rpc_id)); + } + (all, matching) + }, + ); + + let peers = if !ready_peers_matching_best_tip.is_empty() { + ready_peers_matching_best_tip + } else { + ready_peers + }; + if let Some((peer_id, id)) = peers.choose(&mut store.state().pseudo_rng()) { store.dispatch(P2pChannelsRpcAction::RequestSend { peer_id: *peer_id, diff --git a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs index e8a021a09e..c4bb9ac58b 100644 --- a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs +++ b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs @@ -83,8 +83,9 @@ impl redux::EnablingCondition for TransitionFrontierSyncLedgerStag let Some(p2p) = state.p2p.ready() else { return false; }; - let iter = p2p.ready_rpc_peers_iter(); - staged.filter_available_peers(iter).next().is_some() + staged.fetch_attempts().map_or(false, |attempts| { + attempts.is_empty() || attempts.iter().all(|(_, s)| s.is_error()) + }) && p2p.ready_rpc_peers_iter().next().is_some() }), TransitionFrontierSyncLedgerStagedAction::PartsPeerFetchPending { .. } => state .transition_frontier diff --git a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_reducer.rs b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_reducer.rs index 010217a9ab..d7f2934f92 100644 --- a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_reducer.rs +++ b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_reducer.rs @@ -35,22 +35,73 @@ impl TransitionFrontierSyncLedgerStagedState { } TransitionFrontierSyncLedgerStagedAction::PartsPeerFetchInit => { let (dispatcher, global_state) = state_context.into_dispatcher_and_state(); - let Some(staged_ledger) = - None.or_else(|| global_state.transition_frontier.sync.ledger()?.staged()) + let Some((p2p, target_best_tip, staged_ledger, fetch_attempts)) = + None.or_else(|| { + let staged = global_state.transition_frontier.sync.ledger()?.staged()?; + Some(( + global_state.p2p.ready()?, + global_state.transition_frontier.sync.best_tip()?, + staged, + staged.fetch_attempts()?, + )) + }) else { return; }; - let Some(p2p) = global_state.p2p.ready() else { - return; - }; - let block_hash = staged_ledger.target().staged.block_hash.clone(); - let mut ready_peers = staged_ledger - .filter_available_peers(p2p.ready_rpc_peers_iter()) - .collect::>(); - ready_peers.shuffle(&mut global_state.pseudo_rng()); + let mut peers = + p2p.ready_rpc_peers_iter() + .fold(Vec::new(), |mut list, (peer_id, state)| { + let mut order = 0u8; + // TODO(binier): maybe take into account fetch attempt time. + order = order.saturating_add(if fetch_attempts.contains_key(peer_id) { + 5 + } else { + 0 + }); + order = + order.saturating_add(state.best_tip.as_ref().map_or(2, |tip| { + let k = target_best_tip.constants().k.as_u32(); + if tip.height() > target_best_tip.height() + || tip.height().abs_diff(target_best_tip.height()) > k + { + // can't have the block we need + 10 + } else { + // has common block + if IntoIterator::into_iter([ + tip.hash(), + tip.pred_hash(), + target_best_tip.hash(), + target_best_tip.pred_hash(), + ]) + .collect::>() + .len() + < 4 + { + 0 + } else { + 1 + } + } + })); + + if list + .last() + .map_or(false, |(_, _, ord): &(_, _, u8)| *ord > order) + { + // remove less priority peers + list.clear(); + } + list.push((peer_id, state.channels.next_local_rpc_id(), order)); + + list + }); + + let block_hash = staged_ledger.target().staged.block_hash.clone(); + peers.shuffle(&mut global_state.pseudo_rng()); - for (peer_id, rpc_id) in ready_peers { + for (&peer_id, rpc_id, _) in peers { let enqueued = if p2p.is_libp2p_peer(&peer_id) { // use old heavy rpc for libp2p peers. dispatcher.push_if_enabled( diff --git a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_state.rs b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_state.rs index 2e83ee73f6..3aaef96c64 100644 --- a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_state.rs +++ b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_state.rs @@ -132,19 +132,6 @@ impl TransitionFrontierSyncLedgerStagedState { } } - pub fn filter_available_peers<'a>( - &'a self, - iter: impl 'a + Iterator, - ) -> impl 'a + Iterator { - let attempts = self.fetch_attempts(); - iter.filter(move |(peer_id, _)| { - attempts.map_or(false, |attempts| { - !attempts.contains_key(peer_id) - && (attempts.is_empty() || attempts.iter().all(|(_, s)| s.is_error())) - }) - }) - } - pub fn parts_fetch_rpc_id(&self, peer_id: &PeerId) -> Option { self.fetch_attempts()?.get(peer_id)?.fetch_pending_rpc_id() } diff --git a/p2p/src/p2p_state.rs b/p2p/src/p2p_state.rs index 16c7a26811..79d8ac39ee 100644 --- a/p2p/src/p2p_state.rs +++ b/p2p/src/p2p_state.rs @@ -170,10 +170,11 @@ impl P2pState { .filter_map(|(id, p)| Some((id, p.status.as_ready()?))) } - pub fn ready_rpc_peers_iter(&self) -> impl '_ + Iterator { + pub fn ready_rpc_peers_iter( + &self, + ) -> impl '_ + Iterator { self.ready_peers_iter() .filter(|(_, p)| p.channels.rpc.can_send_request()) - .map(|(peer_id, p)| (*peer_id, p.channels.next_local_rpc_id())) } pub fn ready_peers(&self) -> Vec { From 7b6665170245ceb14c0fdbfcdf35a4fb99d2f678 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sun, 3 Nov 2024 15:07:58 +0400 Subject: [PATCH 081/175] feat(testing): specify default cluster config in an individual scenario --- node/testing/src/cluster/config.rs | 8 +- node/testing/src/main.rs | 25 ++--- node/testing/src/scenarios/mod.rs | 97 ++++++++++++++++++- node/testing/src/scenarios/p2p/signaling.rs | 9 ++ node/testing/tests/common.rs | 11 +-- .../node_libp2p_with_rust_to_rust_webrtc.rs | 11 +-- 6 files changed, 129 insertions(+), 32 deletions(-) diff --git a/node/testing/src/cluster/config.rs b/node/testing/src/cluster/config.rs index 30c0abb527..37848cdef3 100644 --- a/node/testing/src/cluster/config.rs +++ b/node/testing/src/cluster/config.rs @@ -42,7 +42,7 @@ impl ClusterConfig { }) } - pub fn use_debugger(mut self) -> Self { + pub fn use_debugger(&mut self) -> &mut Self { self.use_debugger = true; self } @@ -51,7 +51,7 @@ impl ClusterConfig { self.use_debugger } - pub fn set_replay(mut self) -> Self { + pub fn set_replay(&mut self) -> &mut Self { self.is_replay = true; self } @@ -65,7 +65,7 @@ impl ClusterConfig { (range.0)..=(range.1) } - pub fn set_all_rust_to_rust_use_webrtc(mut self) -> Self { + pub fn set_all_rust_to_rust_use_webrtc(&mut self) -> &mut Self { assert!(cfg!(feature = "p2p-webrtc")); self.all_rust_to_rust_use_webrtc = true; self @@ -84,7 +84,7 @@ impl ClusterConfig { self.proof_kind } - pub fn set_ocaml_node_executable(mut self, executable: OcamlNodeExecutable) -> Self { + pub fn set_ocaml_node_executable(&mut self, executable: OcamlNodeExecutable) -> &mut Self { self.ocaml_node_executable = Some(executable); self } diff --git a/node/testing/src/main.rs b/node/testing/src/main.rs index 0398fe2dec..57b362a036 100644 --- a/node/testing/src/main.rs +++ b/node/testing/src/main.rs @@ -78,32 +78,27 @@ impl Command { Self::ScenariosGenerate(cmd) => { #[cfg(feature = "scenario-generators")] { - let config = ClusterConfig::new(None).map_err(|err| { - anyhow::anyhow!("failed to create cluster configuration: {err}") - })?; - let config = if cmd.use_debugger { - config.use_debugger() - } else { - config + let run_scenario = |scenario: Scenarios| -> Result<_, anyhow::Error> { + let mut config = scenario.default_cluster_config()?; + if cmd.use_debugger { + config.use_debugger(); + } + Ok(scenario.run_only_from_scratch(config)) }; - let fut = async move { if let Some(name) = cmd.name { if let Some(scenario) = Scenarios::find_by_name(&name) { - scenario.run_only_from_scratch(config).await; - // scenario.run_and_save_from_scratch(config).await; + run_scenario(scenario)?.await; } else { anyhow::bail!("no such scenario: \"{name}\""); } } else { for scenario in Scenarios::iter() { - scenario.run_only_from_scratch(config.clone()).await; - // scenario.run_and_save_from_scratch(config.clone()).await; + run_scenario(scenario)?.await; } } Ok(()) }; - rt.block_on(async { tokio::select! { res = fut => res, @@ -119,10 +114,10 @@ impl Command { .into()) } Self::ScenariosRun(cmd) => { - let config = ClusterConfig::new(None).map_err(|err| { + let mut config = ClusterConfig::new(None).map_err(|err| { anyhow::anyhow!("failed to create cluster configuration: {err}") })?; - let config = config.set_replay(); + config.set_replay(); let id = cmd.name.parse()?; let fut = async move { diff --git a/node/testing/src/scenarios/mod.rs b/node/testing/src/scenarios/mod.rs index a959c5cfda..9bacc6dbe1 100644 --- a/node/testing/src/scenarios/mod.rs +++ b/node/testing/src/scenarios/mod.rs @@ -18,7 +18,6 @@ pub mod p2p; mod driver; pub use driver::*; -use p2p::signaling::P2pSignaling; pub use crate::cluster::runner::*; @@ -29,13 +28,31 @@ use crate::scenario::{Scenario, ScenarioId, ScenarioStep}; use self::multi_node::basic_connectivity_initial_joining::MultiNodeBasicConnectivityInitialJoining; use self::multi_node::basic_connectivity_peer_discovery::MultiNodeBasicConnectivityPeerDiscovery; +use self::multi_node::connection_discovery::RustNodeAsSeed as P2pConnectionDiscoveryRustNodeAsSeed; +use self::multi_node::connection_discovery::{ + OCamlToRust, OCamlToRustViaSeed, RustToOCaml, RustToOCamlViaSeed, +}; use self::multi_node::pubsub_advanced::MultiNodePubsubPropagateBlock; use self::multi_node::sync_4_block_producers::MultiNodeSync4BlockProducers; use self::multi_node::vrf_correct_ledgers::MultiNodeVrfGetCorrectLedgers; use self::multi_node::vrf_correct_slots::MultiNodeVrfGetCorrectSlots; use self::multi_node::vrf_epoch_bounds_correct_ledgers::MultiNodeVrfEpochBoundsCorrectLedger; use self::multi_node::vrf_epoch_bounds_evaluation::MultiNodeVrfEpochBoundsEvaluation; +use self::p2p::basic_connection_handling::{ + AllNodesConnectionsAreSymmetric, MaxNumberOfPeersIncoming, MaxNumberOfPeersIs1, + SeedConnectionsAreSymmetric, SimultaneousConnections, +}; +use self::p2p::basic_incoming_connections::{ + AcceptIncomingConnection, AcceptMultipleIncomingConnections, +}; +use self::p2p::basic_outgoing_connections::{ + ConnectToInitialPeers, ConnectToInitialPeersBecomeReady, ConnectToUnavailableInitialPeers, + DontConnectToInitialPeerWithSameId, DontConnectToNodeWithSameId, DontConnectToSelfInitialPeer, + MakeMultipleOutgoingConnections, MakeOutgoingConnection, +}; +use self::p2p::kademlia::KademliaBootstrap; use self::p2p::pubsub::P2pReceiveBlock; +use self::p2p::signaling::P2pSignaling; use self::record_replay::block_production::RecordReplayBlockProduction; use self::record_replay::bootstrap::RecordReplayBootstrap; use self::simulation::small::SimulationSmall; @@ -68,9 +85,31 @@ pub enum Scenarios { SimulationSmallForeverRealTime(SimulationSmallForeverRealTime), P2pReceiveBlock(P2pReceiveBlock), P2pSignaling(P2pSignaling), + P2pConnectionDiscoveryRustNodeAsSeed(P2pConnectionDiscoveryRustNodeAsSeed), MultiNodePubsubPropagateBlock(MultiNodePubsubPropagateBlock), RecordReplayBootstrap(RecordReplayBootstrap), RecordReplayBlockProduction(RecordReplayBlockProduction), + + RustToOCaml(RustToOCaml), + OCamlToRust(OCamlToRust), + OCamlToRustViaSeed(OCamlToRustViaSeed), + RustToOCamlViaSeed(RustToOCamlViaSeed), + KademliaBootstrap(KademliaBootstrap), + AcceptIncomingConnection(AcceptIncomingConnection), + MakeOutgoingConnection(MakeOutgoingConnection), + AcceptMultipleIncomingConnections(AcceptMultipleIncomingConnections), + MakeMultipleOutgoingConnections(MakeMultipleOutgoingConnections), + DontConnectToNodeWithSameId(DontConnectToNodeWithSameId), + DontConnectToInitialPeerWithSameId(DontConnectToInitialPeerWithSameId), + DontConnectToSelfInitialPeer(DontConnectToSelfInitialPeer), + SimultaneousConnections(SimultaneousConnections), + ConnectToInitialPeers(ConnectToInitialPeers), + ConnectToUnavailableInitialPeers(ConnectToUnavailableInitialPeers), + AllNodesConnectionsAreSymmetric(AllNodesConnectionsAreSymmetric), + ConnectToInitialPeersBecomeReady(ConnectToInitialPeersBecomeReady), + SeedConnectionsAreSymmetric(SeedConnectionsAreSymmetric), + MaxNumberOfPeersIncoming(MaxNumberOfPeersIncoming), + MaxNumberOfPeersIs1(MaxNumberOfPeersIs1), } impl Scenarios { @@ -152,9 +191,43 @@ impl Scenarios { Self::SimulationSmallForeverRealTime(_) => SimulationSmallForeverRealTime::DOCS, Self::P2pReceiveBlock(_) => P2pReceiveBlock::DOCS, Self::P2pSignaling(_) => P2pSignaling::DOCS, + Self::P2pConnectionDiscoveryRustNodeAsSeed(_) => { + P2pConnectionDiscoveryRustNodeAsSeed::DOCS + } Self::MultiNodePubsubPropagateBlock(_) => MultiNodePubsubPropagateBlock::DOCS, Self::RecordReplayBootstrap(_) => RecordReplayBootstrap::DOCS, Self::RecordReplayBlockProduction(_) => RecordReplayBlockProduction::DOCS, + + Self::RustToOCaml(_) => RustToOCaml::DOCS, + Self::OCamlToRust(_) => OCamlToRust::DOCS, + Self::OCamlToRustViaSeed(_) => OCamlToRustViaSeed::DOCS, + Self::RustToOCamlViaSeed(_) => RustToOCamlViaSeed::DOCS, + Self::KademliaBootstrap(_) => KademliaBootstrap::DOCS, + Self::AcceptIncomingConnection(_) => AcceptIncomingConnection::DOCS, + Self::MakeOutgoingConnection(_) => MakeOutgoingConnection::DOCS, + Self::AcceptMultipleIncomingConnections(_) => AcceptMultipleIncomingConnections::DOCS, + Self::MakeMultipleOutgoingConnections(_) => MakeMultipleOutgoingConnections::DOCS, + Self::DontConnectToNodeWithSameId(_) => DontConnectToNodeWithSameId::DOCS, + Self::DontConnectToInitialPeerWithSameId(_) => DontConnectToInitialPeerWithSameId::DOCS, + Self::DontConnectToSelfInitialPeer(_) => DontConnectToSelfInitialPeer::DOCS, + Self::SimultaneousConnections(_) => SimultaneousConnections::DOCS, + Self::ConnectToInitialPeers(_) => ConnectToInitialPeers::DOCS, + Self::ConnectToUnavailableInitialPeers(_) => ConnectToUnavailableInitialPeers::DOCS, + Self::AllNodesConnectionsAreSymmetric(_) => AllNodesConnectionsAreSymmetric::DOCS, + Self::ConnectToInitialPeersBecomeReady(_) => ConnectToInitialPeersBecomeReady::DOCS, + Self::SeedConnectionsAreSymmetric(_) => SeedConnectionsAreSymmetric::DOCS, + Self::MaxNumberOfPeersIncoming(_) => MaxNumberOfPeersIncoming::DOCS, + Self::MaxNumberOfPeersIs1(_) => MaxNumberOfPeersIs1::DOCS, + } + } + + pub fn default_cluster_config(self) -> Result { + let config = ClusterConfig::new(None) + .map_err(|err| anyhow::anyhow!("failed to create cluster configuration: {err}"))?; + + match self { + Self::P2pSignaling(v) => v.default_cluster_config(config), + _ => Ok(config), } } @@ -189,9 +262,31 @@ impl Scenarios { Self::SimulationSmallForeverRealTime(v) => v.run(runner).await, Self::P2pReceiveBlock(v) => v.run(runner).await, Self::P2pSignaling(v) => v.run(runner).await, + Self::P2pConnectionDiscoveryRustNodeAsSeed(v) => v.run(runner).await, Self::MultiNodePubsubPropagateBlock(v) => v.run(runner).await, Self::RecordReplayBootstrap(v) => v.run(runner).await, Self::RecordReplayBlockProduction(v) => v.run(runner).await, + + Self::RustToOCaml(v) => v.run(runner).await, + Self::OCamlToRust(v) => v.run(runner).await, + Self::OCamlToRustViaSeed(v) => v.run(runner).await, + Self::RustToOCamlViaSeed(v) => v.run(runner).await, + Self::KademliaBootstrap(v) => v.run(runner).await, + Self::AcceptIncomingConnection(v) => v.run(runner).await, + Self::MakeOutgoingConnection(v) => v.run(runner).await, + Self::AcceptMultipleIncomingConnections(v) => v.run(runner).await, + Self::MakeMultipleOutgoingConnections(v) => v.run(runner).await, + Self::DontConnectToNodeWithSameId(v) => v.run(runner).await, + Self::DontConnectToInitialPeerWithSameId(v) => v.run(runner).await, + Self::DontConnectToSelfInitialPeer(v) => v.run(runner).await, + Self::SimultaneousConnections(v) => v.run(runner).await, + Self::ConnectToInitialPeers(v) => v.run(runner).await, + Self::ConnectToUnavailableInitialPeers(v) => v.run(runner).await, + Self::AllNodesConnectionsAreSymmetric(v) => v.run(runner).await, + Self::ConnectToInitialPeersBecomeReady(v) => v.run(runner).await, + Self::SeedConnectionsAreSymmetric(v) => v.run(runner).await, + Self::MaxNumberOfPeersIncoming(v) => v.run(runner).await, + Self::MaxNumberOfPeersIs1(v) => v.run(runner).await, } } diff --git a/node/testing/src/scenarios/p2p/signaling.rs b/node/testing/src/scenarios/p2p/signaling.rs index 5124238d6a..288ab075d0 100644 --- a/node/testing/src/scenarios/p2p/signaling.rs +++ b/node/testing/src/scenarios/p2p/signaling.rs @@ -6,6 +6,7 @@ use node::{ }; use crate::{ + cluster::ClusterConfig, node::RustNodeTestingConfig, scenarios::{ClusterRunner, DynEffectsData, RunCfg}, }; @@ -16,6 +17,14 @@ use crate::{ pub struct P2pSignaling; impl P2pSignaling { + pub fn default_cluster_config( + self, + mut config: ClusterConfig, + ) -> Result { + config.set_all_rust_to_rust_use_webrtc(); + Ok(config) + } + pub async fn run(self, mut runner: ClusterRunner<'_>) { const NODES_N: usize = 4; diff --git a/node/testing/tests/common.rs b/node/testing/tests/common.rs index f4c9e3e8e9..e62bb8caf2 100644 --- a/node/testing/tests/common.rs +++ b/node/testing/tests/common.rs @@ -18,8 +18,8 @@ macro_rules! scenario_test { $(#[$meta])? async fn $name() { use openmina_node_testing::{ - cluster::{Cluster, ClusterConfig}, - scenarios::ClusterRunner, + cluster::Cluster, + scenarios::{ClusterRunner, Scenarios}, setup_without_rt, wait_for_other_tests, }; use std::io::Write; @@ -57,16 +57,15 @@ macro_rules! scenario_test { })); } + let scenario = $scenario_instance; #[allow(unused_mut)] - let mut config = ClusterConfig::new(None).unwrap(); + let mut config = Scenarios::from(scenario).default_cluster_config().unwrap(); #[cfg(feature = "p2p-webrtc")] if $can_test_webrtc { - eprintln!("All rust to rust connections will be over webrtc transport"); - config = config.set_all_rust_to_rust_use_webrtc(); + config.set_all_rust_to_rust_use_webrtc(); } let mut cluster = Cluster::new(config); let runner = ClusterRunner::new(&mut cluster, |_| {}); - let scenario = $scenario_instance; scenario.run(runner).await; if let Some(summary) = std::env::var_os("GITHUB_STEP_SUMMARY") { diff --git a/node/testing/tests/node_libp2p_with_rust_to_rust_webrtc.rs b/node/testing/tests/node_libp2p_with_rust_to_rust_webrtc.rs index 914e2b116c..492932f6f3 100644 --- a/node/testing/tests/node_libp2p_with_rust_to_rust_webrtc.rs +++ b/node/testing/tests/node_libp2p_with_rust_to_rust_webrtc.rs @@ -1,18 +1,17 @@ #[cfg(feature = "p2p-webrtc")] -use openmina_node_testing::{cluster::ClusterConfig, scenarios::Scenarios, setup}; +use openmina_node_testing::{scenarios::Scenarios, setup}; #[cfg(feature = "p2p-webrtc")] #[test] fn node_libp2p_with_rust_to_rust_webrtc_all_scenarios() { let rt = setup(); - let config = ClusterConfig::new(None) - .unwrap() - .set_all_rust_to_rust_use_webrtc(); for scenario in Scenarios::iter() { eprintln!("running scenario: {}", scenario.to_str()); - rt.block_on(async { - scenario.run_only_from_scratch(config.clone()).await; + let mut config = scenario.default_cluster_config().unwrap(); + config.set_all_rust_to_rust_use_webrtc(); + rt.block_on(async move { + scenario.run_only_from_scratch(config).await; }); } } From e0cdf5b518612bb05b0ea2be80a6300c332c8042 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Tue, 19 Nov 2024 21:03:41 -0300 Subject: [PATCH 082/175] fix(p2p): Avoid unnecessary buffer allocations on mio recv --- p2p/src/network/p2p_network_service.rs | 4 ++-- ...p2p_network_scheduler_effectful_effects.rs | 4 +--- p2p/src/service_impl/mio/mod.rs | 19 +++++++++++++++---- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/p2p/src/network/p2p_network_service.rs b/p2p/src/network/p2p_network_service.rs index 093b2c3c75..81743513de 100644 --- a/p2p/src/network/p2p_network_service.rs +++ b/p2p/src/network/p2p_network_service.rs @@ -14,8 +14,8 @@ pub enum MioCmd { Refuse(SocketAddr), /// Create a new outgoing connection to the socket. Connect(SocketAddr), - /// Receive some data from the connection in the buffer. - Recv(ConnectionAddr, Box<[u8]>), + /// Receive some data from the connection. + Recv(ConnectionAddr, usize), /// Send the data in the connection. Send(ConnectionAddr, Box<[u8]>), /// Disconnect the remote peer. diff --git a/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_effects.rs b/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_effects.rs index b4ff0e6d08..d2e14dc8fa 100644 --- a/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_effects.rs +++ b/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_effects.rs @@ -47,9 +47,7 @@ impl P2pNetworkSchedulerEffectfulAction { }); } P2pNetworkSchedulerEffectfulAction::IncomingDataIsReady { addr, limit } => { - store - .service() - .send_mio_cmd(MioCmd::Recv(addr, vec![0; limit].into_boxed_slice())); + store.service().send_mio_cmd(MioCmd::Recv(addr, limit)); } P2pNetworkSchedulerEffectfulAction::NoiseSelectDone { addr, incoming } => { let ephemeral_sk = Sk::from_random(store.service().ephemeral_sk()); diff --git a/p2p/src/service_impl/mio/mod.rs b/p2p/src/service_impl/mio/mod.rs index 84d034aa26..0ab78ab33a 100644 --- a/p2p/src/service_impl/mio/mod.rs +++ b/p2p/src/service_impl/mio/mod.rs @@ -144,6 +144,7 @@ impl MioRunningService { tokens, listeners: BTreeMap::default(), connections: BTreeMap::default(), + recv_buf: vec![0; 0x8000], }; std::thread::Builder::new() @@ -177,6 +178,7 @@ struct MioServiceInner { tokens: TokenRegistry, listeners: BTreeMap, connections: BTreeMap, + recv_buf: Vec, } struct Listener { @@ -476,20 +478,29 @@ where )), }; } - Recv(addr, mut buf) => { + Recv(addr, limit) => { if let Some(mut connection) = self.connections.remove(&addr) { + // Ensure the buffer has enough space for the requested limit + if limit > self.recv_buf.len() { + // TODO: upper bound? resize to `limit` or try to allocate some extra space too? + self.recv_buf.resize(limit, 0); + } + let mut keep = false; - match connection.stream.read(&mut buf) { + match connection.stream.read(&mut self.recv_buf[..limit]) { Ok(0) => self.send(MioEvent::ConnectionDidClose(addr, Ok(()))), Ok(read) => { self.send(MioEvent::IncomingDataDidReceive( addr, - Ok(buf[..read].to_vec().into()), + Ok(self.recv_buf[..read].to_vec().into()), )); self.send(MioEvent::IncomingDataIsReady(addr)); keep = true; } - Err(err) if err.kind() == io::ErrorKind::WouldBlock => { + Err(err) + if err.kind() == io::ErrorKind::WouldBlock + || err.kind() == io::ErrorKind::Interrupted => + { connection.incoming_ready = false; keep = true; } From ea2c4f70724c30855a4b80097b40cf30d68599ae Mon Sep 17 00:00:00 2001 From: Mimir Date: Wed, 20 Nov 2024 15:21:07 +0100 Subject: [PATCH 083/175] Ported external snark workers --- node/src/action.rs | 3 + node/src/action_kind.rs | 19 ++- node/src/effects.rs | 9 +- node/src/event_source/event.rs | 2 +- node/src/event_source/event_source_effects.rs | 2 +- .../external_snark_worker_actions.rs | 1 - .../external_snark_worker_effects.rs | 106 ------------ .../external_snark_worker_reducer.rs | 153 +++++++++++++++--- node/src/external_snark_worker/mod.rs | 6 - ...external_snark_worker_effectful_actions.rs | 25 +++ ...external_snark_worker_effectful_effects.rs | 41 +++++ .../external_snark_worker_service.rs | 2 +- .../external_snark_worker_effectful/mod.rs | 8 + node/src/lib.rs | 1 + node/src/reducer.rs | 12 +- node/src/service.rs | 2 +- node/src/state.rs | 3 +- node/testing/src/service/mod.rs | 5 +- 18 files changed, 250 insertions(+), 150 deletions(-) delete mode 100644 node/src/external_snark_worker/external_snark_worker_effects.rs create mode 100644 node/src/external_snark_worker_effectful/external_snark_worker_effectful_actions.rs create mode 100644 node/src/external_snark_worker_effectful/external_snark_worker_effectful_effects.rs rename node/src/{external_snark_worker => external_snark_worker_effectful}/external_snark_worker_service.rs (96%) create mode 100644 node/src/external_snark_worker_effectful/mod.rs diff --git a/node/src/action.rs b/node/src/action.rs index 88ac985bf8..87b0c15071 100644 --- a/node/src/action.rs +++ b/node/src/action.rs @@ -9,6 +9,7 @@ pub use crate::block_producer_effectful::BlockProducerEffectfulAction; pub use crate::consensus::ConsensusAction; pub use crate::event_source::EventSourceAction; pub use crate::external_snark_worker::ExternalSnarkWorkerAction; +use crate::external_snark_worker_effectful::ExternalSnarkWorkerEffectfulAction; pub use crate::ledger::LedgerAction; use crate::p2p::callbacks::P2pCallbacksAction; pub use crate::p2p::P2pAction; @@ -48,6 +49,7 @@ pub enum Action { TransactionPool(TransactionPoolAction), TransactionPoolEffect(TransactionPoolEffectfulAction), ExternalSnarkWorker(ExternalSnarkWorkerAction), + ExternalSnarkWorkerEffects(ExternalSnarkWorkerEffectfulAction), BlockProducer(BlockProducerAction), BlockProducerEffectful(BlockProducerEffectfulAction), Rpc(RpcAction), @@ -93,6 +95,7 @@ impl redux::EnablingCondition for Action { Action::SnarkPool(a) => a.is_enabled(state, time), Action::SnarkPoolEffect(a) => a.is_enabled(state, time), Action::ExternalSnarkWorker(a) => a.is_enabled(state, time), + Action::ExternalSnarkWorkerEffects(a) => a.is_enabled(state, time), Action::BlockProducer(a) => a.is_enabled(state, time), Action::BlockProducerEffectful(a) => a.is_enabled(state, time), Action::Rpc(a) => a.is_enabled(state, time), diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index cee7438a5d..6ed3c79b7e 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -22,6 +22,7 @@ use crate::block_producer_effectful::BlockProducerEffectfulAction; use crate::consensus::ConsensusAction; use crate::event_source::EventSourceAction; use crate::external_snark_worker::ExternalSnarkWorkerAction; +use crate::external_snark_worker_effectful::ExternalSnarkWorkerEffectfulAction; use crate::ledger::read::LedgerReadAction; use crate::ledger::write::LedgerWriteAction; use crate::ledger::LedgerAction; @@ -185,6 +186,10 @@ pub enum ActionKind { ExternalSnarkWorkerWorkError, ExternalSnarkWorkerWorkResult, ExternalSnarkWorkerWorkTimeout, + ExternalSnarkWorkerEffectfulCancelWork, + ExternalSnarkWorkerEffectfulKill, + ExternalSnarkWorkerEffectfulStart, + ExternalSnarkWorkerEffectfulSubmitWork, LedgerReadFindTodos, LedgerReadInit, LedgerReadPending, @@ -706,7 +711,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 591; + pub const COUNT: u16 = 595; } impl std::fmt::Display for ActionKind { @@ -732,6 +737,7 @@ impl ActionKindGet for Action { Self::TransactionPool(a) => a.kind(), Self::TransactionPoolEffect(a) => a.kind(), Self::ExternalSnarkWorker(a) => a.kind(), + Self::ExternalSnarkWorkerEffects(a) => a.kind(), Self::BlockProducer(a) => a.kind(), Self::BlockProducerEffectful(a) => a.kind(), Self::Rpc(a) => a.kind(), @@ -951,6 +957,17 @@ impl ActionKindGet for ExternalSnarkWorkerAction { } } +impl ActionKindGet for ExternalSnarkWorkerEffectfulAction { + fn kind(&self) -> ActionKind { + match self { + Self::Start { .. } => ActionKind::ExternalSnarkWorkerEffectfulStart, + Self::Kill => ActionKind::ExternalSnarkWorkerEffectfulKill, + Self::SubmitWork { .. } => ActionKind::ExternalSnarkWorkerEffectfulSubmitWork, + Self::CancelWork => ActionKind::ExternalSnarkWorkerEffectfulCancelWork, + } + } +} + impl ActionKindGet for BlockProducerAction { fn kind(&self) -> ActionKind { match self { diff --git a/node/src/effects.rs b/node/src/effects.rs index a8a9a28e24..86be10df86 100644 --- a/node/src/effects.rs +++ b/node/src/effects.rs @@ -4,7 +4,7 @@ use rand::prelude::*; use crate::block_producer::BlockProducerAction; use crate::block_producer_effectful::block_producer_effects; use crate::event_source::event_source_effects; -use crate::external_snark_worker::external_snark_worker_effects; +use crate::external_snark_worker_effectful::external_snark_worker_effectful_effects; use crate::ledger::ledger_effects; use crate::ledger::read::LedgerReadAction; use crate::logger::logger_effects; @@ -88,8 +88,11 @@ pub fn effects(store: &mut Store, action: ActionWithMeta) { Action::BlockProducerEffectful(action) => { block_producer_effects(store, meta.with_action(action)); } - Action::ExternalSnarkWorker(action) => { - external_snark_worker_effects(store, meta.with_action(action)); + Action::ExternalSnarkWorker(_) => { + // Handled by reducer + } + Action::ExternalSnarkWorkerEffects(action) => { + external_snark_worker_effectful_effects(store, meta.with_action(action)); } Action::Rpc(_) => { // Handled by reducer diff --git a/node/src/event_source/event.rs b/node/src/event_source/event.rs index c37a913b6e..66bdfa78d9 100644 --- a/node/src/event_source/event.rs +++ b/node/src/event_source/event.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; pub use crate::block_producer::BlockProducerEvent; -pub use crate::external_snark_worker::ExternalSnarkWorkerEvent; +pub use crate::external_snark_worker_effectful::ExternalSnarkWorkerEvent; pub use crate::ledger::LedgerEvent; pub use crate::p2p::{P2pConnectionEvent, P2pEvent}; pub use crate::rpc::{RpcId, RpcRequest}; diff --git a/node/src/event_source/event_source_effects.rs b/node/src/event_source/event_source_effects.rs index 339ba4e81e..480b2560d0 100644 --- a/node/src/event_source/event_source_effects.rs +++ b/node/src/event_source/event_source_effects.rs @@ -8,7 +8,7 @@ use snark::user_command_verify::{SnarkUserCommandVerifyAction, SnarkUserCommandV use crate::action::CheckTimeoutsAction; use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorAction; use crate::block_producer::{BlockProducerEvent, BlockProducerVrfEvaluatorEvent}; -use crate::external_snark_worker::ExternalSnarkWorkerEvent; +use crate::external_snark_worker_effectful::ExternalSnarkWorkerEvent; use crate::ledger::read::LedgerReadAction; use crate::ledger::write::LedgerWriteAction; use crate::p2p::channels::best_tip::P2pChannelsBestTipAction; diff --git a/node/src/external_snark_worker/external_snark_worker_actions.rs b/node/src/external_snark_worker/external_snark_worker_actions.rs index 776b231e41..2599906985 100644 --- a/node/src/external_snark_worker/external_snark_worker_actions.rs +++ b/node/src/external_snark_worker/external_snark_worker_actions.rs @@ -47,7 +47,6 @@ pub enum ExternalSnarkWorkerAction { }, } -pub type ExternalSnarkWorkerActionWithMeta = redux::ActionWithMeta; pub type ExternalSnarkWorkerActionWithMetaRef<'a> = redux::ActionWithMeta<&'a ExternalSnarkWorkerAction>; diff --git a/node/src/external_snark_worker/external_snark_worker_effects.rs b/node/src/external_snark_worker/external_snark_worker_effects.rs deleted file mode 100644 index 63bbcdb6b4..0000000000 --- a/node/src/external_snark_worker/external_snark_worker_effects.rs +++ /dev/null @@ -1,106 +0,0 @@ -use openmina_core::snark::Snark; - -use crate::{p2p_ready, snark_pool::SnarkPoolAction}; - -use super::{ - available_job_to_snark_worker_spec, ExternalSnarkWorkerAction, - ExternalSnarkWorkerActionWithMeta, -}; - -pub fn external_snark_worker_effects( - store: &mut crate::Store, - action: ExternalSnarkWorkerActionWithMeta, -) { - let (action, meta) = action.split(); - match action { - ExternalSnarkWorkerAction::Start => { - let Some(config) = &store.state.get().config.snarker else { - return; - }; - let public_key = config.public_key.clone().into(); - let fee = config.fee.clone(); - if let Err(err) = store.service.start(public_key, fee) { - store.dispatch(ExternalSnarkWorkerAction::Error { - error: err, - permanent: true, - }); - } - } - ExternalSnarkWorkerAction::Started => { - store.dispatch(SnarkPoolAction::AutoCreateCommitment); - } - ExternalSnarkWorkerAction::StartTimeout { .. } => { - store.dispatch(ExternalSnarkWorkerAction::Error { - error: super::ExternalSnarkWorkerError::StartTimeout, - permanent: true, - }); - } - ExternalSnarkWorkerAction::Kill => { - if let Err(err) = store.service().kill() { - store.dispatch(ExternalSnarkWorkerAction::Error { - error: err, - permanent: true, - }); - } - } - ExternalSnarkWorkerAction::Killed => {} - ExternalSnarkWorkerAction::Error { .. } => { - store.dispatch(ExternalSnarkWorkerAction::Kill); - } - ExternalSnarkWorkerAction::SubmitWork { job_id, .. } => { - let Some(job) = store.state().snark_pool.get(&job_id) else { - return; - }; - let input = match available_job_to_snark_worker_spec( - job.job.clone(), - &store.state().transition_frontier, - ) { - Ok(v) => v, - Err(err) => { - store.dispatch(ExternalSnarkWorkerAction::WorkError { error: err.into() }); - return; - } - }; - if let Err(err) = store.service().submit(input) { - store.dispatch(ExternalSnarkWorkerAction::WorkError { error: err.into() }); - } - } - ExternalSnarkWorkerAction::WorkResult { result } => { - let Some(config) = &store.state().config.snarker else { - return; - }; - let p2p = p2p_ready!(store.state().p2p, meta.time()); - let snarker = config.public_key.clone().into(); - let fee = config.fee.clone(); - let snark = Snark { - snarker, - fee, - proofs: result.clone(), - }; - let sender = p2p.my_id(); - // Directly add snark to the snark pool as it's produced by us. - store.dispatch(SnarkPoolAction::WorkAdd { snark, sender }); - store.dispatch(ExternalSnarkWorkerAction::PruneWork); - } - ExternalSnarkWorkerAction::WorkError { .. } => { - store.dispatch(ExternalSnarkWorkerAction::PruneWork); - } - ExternalSnarkWorkerAction::WorkTimeout { .. } => { - store.dispatch(ExternalSnarkWorkerAction::CancelWork); - } - ExternalSnarkWorkerAction::CancelWork => { - if let Err(error) = store.service().cancel() { - store.dispatch(ExternalSnarkWorkerAction::Error { - error, - permanent: true, - }); - } - } - ExternalSnarkWorkerAction::WorkCancelled => { - store.dispatch(ExternalSnarkWorkerAction::PruneWork); - } - ExternalSnarkWorkerAction::PruneWork => { - store.dispatch(SnarkPoolAction::AutoCreateCommitment); - } - } -} diff --git a/node/src/external_snark_worker/external_snark_worker_reducer.rs b/node/src/external_snark_worker/external_snark_worker_reducer.rs index 6a0e7934a2..6ad5c9677c 100644 --- a/node/src/external_snark_worker/external_snark_worker_reducer.rs +++ b/node/src/external_snark_worker/external_snark_worker_reducer.rs @@ -1,70 +1,179 @@ +use openmina_core::snark::Snark; +use redux::Timestamp; + use super::{ + available_job_to_snark_worker_spec, external_snark_worker_state::{ExternalSnarkWorker, ExternalSnarkWorkerState}, - ExternalSnarkWorkerAction, ExternalSnarkWorkerActionWithMetaRef, ExternalSnarkWorkers, + ExternalSnarkWorkerAction, ExternalSnarkWorkerActionWithMetaRef, ExternalSnarkWorkerWorkError, + ExternalSnarkWorkers, +}; +use crate::{ + external_snark_worker_effectful::ExternalSnarkWorkerEffectfulAction, p2p_ready, + SnarkPoolAction, Substate, }; impl ExternalSnarkWorkers { - pub fn reducer(&mut self, action: ExternalSnarkWorkerActionWithMetaRef<'_>) { - self.0.reducer(action) + pub fn reducer( + state_context: Substate, + action: ExternalSnarkWorkerActionWithMetaRef<'_>, + ) { + ExternalSnarkWorker::reducer(Substate::from_compatible_substate(state_context), action); } } impl ExternalSnarkWorker { - pub fn reducer(&mut self, action: ExternalSnarkWorkerActionWithMetaRef<'_>) { + pub fn reducer( + mut state_context: Substate, + action: ExternalSnarkWorkerActionWithMetaRef<'_>, + ) { + let Ok(worker_state) = state_context.get_substate_mut() else { + return; + }; let (action, meta) = action.split(); match action { ExternalSnarkWorkerAction::Start => { - self.state = ExternalSnarkWorkerState::Starting; + worker_state.state = ExternalSnarkWorkerState::Starting; + worker_state.update_timestamp(meta.time()); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let Some(config) = &state.config.snarker else { + return; + }; + + let public_key = config.public_key.clone().into(); + let fee = config.fee.clone(); + + dispatcher.push(ExternalSnarkWorkerEffectfulAction::Start { public_key, fee }); } ExternalSnarkWorkerAction::Started => { - self.state = ExternalSnarkWorkerState::Idle; + worker_state.state = ExternalSnarkWorkerState::Idle; + worker_state.update_timestamp(meta.time()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(SnarkPoolAction::AutoCreateCommitment); } ExternalSnarkWorkerAction::StartTimeout { .. } => { - return; + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(ExternalSnarkWorkerAction::Error { + error: super::ExternalSnarkWorkerError::StartTimeout, + permanent: true, + }); } ExternalSnarkWorkerAction::Kill => { - self.state = ExternalSnarkWorkerState::Killing; + worker_state.state = ExternalSnarkWorkerState::Killing; + worker_state.update_timestamp(meta.time()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(ExternalSnarkWorkerEffectfulAction::Kill); } ExternalSnarkWorkerAction::Killed => { - self.state = ExternalSnarkWorkerState::None; + worker_state.state = ExternalSnarkWorkerState::None; + worker_state.update_timestamp(meta.time()); } ExternalSnarkWorkerAction::Error { error, permanent } => { - self.state = ExternalSnarkWorkerState::Error(error.clone(), *permanent); + worker_state.state = ExternalSnarkWorkerState::Error(error.clone(), *permanent); + worker_state.update_timestamp(meta.time()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(ExternalSnarkWorkerAction::Kill); } ExternalSnarkWorkerAction::SubmitWork { job_id, summary } => { - self.state = ExternalSnarkWorkerState::Working(job_id.clone(), summary.clone()); + worker_state.state = + ExternalSnarkWorkerState::Working(job_id.clone(), summary.clone()); + worker_state.update_timestamp(meta.time()); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let Some(job) = state.snark_pool.get(job_id) else { + return; + }; + + match available_job_to_snark_worker_spec( + job.job.clone(), + &state.transition_frontier, + ) { + Ok(spec) => { + dispatcher.push(ExternalSnarkWorkerEffectfulAction::SubmitWork { + spec: Box::new(spec), + }); + } + Err(err) => { + dispatcher.push(ExternalSnarkWorkerAction::WorkError { + error: ExternalSnarkWorkerWorkError::WorkSpecError(err), + }); + } + } } ExternalSnarkWorkerAction::WorkResult { result } => { - let ExternalSnarkWorkerState::Working(job_id, _) = &self.state else { + let ExternalSnarkWorkerState::Working(job_id, _) = &worker_state.state else { + return; + }; + worker_state.state = + ExternalSnarkWorkerState::WorkReady(job_id.clone(), result.clone()); + worker_state.update_timestamp(meta.time()); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let Some(config) = &state.config.snarker else { return; }; - self.state = ExternalSnarkWorkerState::WorkReady(job_id.clone(), result.clone()); + let p2p = p2p_ready!(state.p2p, meta.time()); + let snarker = config.public_key.clone().into(); + let fee = config.fee.clone(); + let snark = Snark { + snarker, + fee, + proofs: result.clone(), + }; + let sender = p2p.my_id(); + // Directly add snark to the snark pool as it's produced by us. + dispatcher.push(SnarkPoolAction::WorkAdd { snark, sender }); + dispatcher.push(ExternalSnarkWorkerAction::PruneWork); } ExternalSnarkWorkerAction::WorkError { error } => { - let ExternalSnarkWorkerState::Working(job_id, _) = &self.state else { + let ExternalSnarkWorkerState::Working(job_id, _) = &worker_state.state else { return; }; - self.state = ExternalSnarkWorkerState::WorkError(job_id.clone(), error.clone()); + worker_state.state = + ExternalSnarkWorkerState::WorkError(job_id.clone(), error.clone()); + worker_state.update_timestamp(meta.time()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(ExternalSnarkWorkerAction::PruneWork); } ExternalSnarkWorkerAction::WorkTimeout { .. } => { - return; + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(ExternalSnarkWorkerAction::CancelWork); } ExternalSnarkWorkerAction::CancelWork => { - let ExternalSnarkWorkerState::Working(job_id, _) = &self.state else { + let ExternalSnarkWorkerState::Working(job_id, _) = &worker_state.state else { return; }; - self.state = ExternalSnarkWorkerState::Cancelling(job_id.clone()); + worker_state.state = ExternalSnarkWorkerState::Cancelling(job_id.clone()); + worker_state.update_timestamp(meta.time()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(ExternalSnarkWorkerEffectfulAction::CancelWork); } ExternalSnarkWorkerAction::WorkCancelled => { - let ExternalSnarkWorkerState::Cancelling(job_id) = &self.state else { + let ExternalSnarkWorkerState::Cancelling(job_id) = &worker_state.state else { return; }; - self.state = ExternalSnarkWorkerState::Cancelled(job_id.clone()); + worker_state.state = ExternalSnarkWorkerState::Cancelled(job_id.clone()); + worker_state.update_timestamp(meta.time()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(ExternalSnarkWorkerAction::PruneWork); } ExternalSnarkWorkerAction::PruneWork => { - self.state = ExternalSnarkWorkerState::Idle; + worker_state.state = ExternalSnarkWorkerState::Idle; + worker_state.update_timestamp(meta.time()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(SnarkPoolAction::AutoCreateCommitment); } } - self.timestamp = meta.time(); + } + + fn update_timestamp(&mut self, time: Timestamp) { + self.timestamp = time; } } diff --git a/node/src/external_snark_worker/mod.rs b/node/src/external_snark_worker/mod.rs index dcb8dea9f0..2580a960ea 100644 --- a/node/src/external_snark_worker/mod.rs +++ b/node/src/external_snark_worker/mod.rs @@ -9,12 +9,6 @@ pub use external_snark_worker_actions::*; mod external_snark_worker_reducer; -mod external_snark_worker_effects; -pub use external_snark_worker_effects::external_snark_worker_effects; - -mod external_snark_worker_service; -pub use external_snark_worker_service::*; - mod external_snark_worker_errors; pub use external_snark_worker_errors::*; diff --git a/node/src/external_snark_worker_effectful/external_snark_worker_effectful_actions.rs b/node/src/external_snark_worker_effectful/external_snark_worker_effectful_actions.rs new file mode 100644 index 0000000000..e493e3d906 --- /dev/null +++ b/node/src/external_snark_worker_effectful/external_snark_worker_effectful_actions.rs @@ -0,0 +1,25 @@ +use mina_p2p_messages::v2::{CurrencyFeeStableV1, NonZeroCurvePoint}; +use openmina_core::ActionEvent; +use redux::EnablingCondition; +use serde::{Deserialize, Serialize}; + +use crate::{external_snark_worker::SnarkWorkSpec, State}; + +#[derive(Debug, Clone, Serialize, Deserialize, ActionEvent)] +pub enum ExternalSnarkWorkerEffectfulAction { + Start { + public_key: NonZeroCurvePoint, + fee: CurrencyFeeStableV1, + }, + Kill, + SubmitWork { + spec: Box, + }, + CancelWork, +} + +impl EnablingCondition for ExternalSnarkWorkerEffectfulAction { + fn is_enabled(&self, _state: &State, _time: redux::Timestamp) -> bool { + true + } +} diff --git a/node/src/external_snark_worker_effectful/external_snark_worker_effectful_effects.rs b/node/src/external_snark_worker_effectful/external_snark_worker_effectful_effects.rs new file mode 100644 index 0000000000..e2487f0e67 --- /dev/null +++ b/node/src/external_snark_worker_effectful/external_snark_worker_effectful_effects.rs @@ -0,0 +1,41 @@ +use super::ExternalSnarkWorkerEffectfulAction; +use crate::ExternalSnarkWorkerAction; +use redux::ActionWithMeta; + +pub fn external_snark_worker_effectful_effects( + store: &mut crate::Store, + action: ActionWithMeta, +) { + let (action, _) = action.split(); + match action { + ExternalSnarkWorkerEffectfulAction::Start { public_key, fee } => { + if let Err(err) = store.service.start(public_key, fee) { + store.dispatch(ExternalSnarkWorkerAction::Error { + error: err, + permanent: true, + }); + } + } + ExternalSnarkWorkerEffectfulAction::Kill => { + if let Err(err) = store.service().kill() { + store.dispatch(ExternalSnarkWorkerAction::Error { + error: err, + permanent: true, + }); + } + } + ExternalSnarkWorkerEffectfulAction::SubmitWork { spec } => { + if let Err(err) = store.service().submit(*spec) { + store.dispatch(ExternalSnarkWorkerAction::WorkError { error: err.into() }); + } + } + ExternalSnarkWorkerEffectfulAction::CancelWork => { + if let Err(error) = store.service().cancel() { + store.dispatch(ExternalSnarkWorkerAction::Error { + error, + permanent: true, + }); + } + } + } +} diff --git a/node/src/external_snark_worker/external_snark_worker_service.rs b/node/src/external_snark_worker_effectful/external_snark_worker_service.rs similarity index 96% rename from node/src/external_snark_worker/external_snark_worker_service.rs rename to node/src/external_snark_worker_effectful/external_snark_worker_service.rs index 4a7b5269b1..730b12b195 100644 --- a/node/src/external_snark_worker/external_snark_worker_service.rs +++ b/node/src/external_snark_worker_effectful/external_snark_worker_service.rs @@ -1,7 +1,7 @@ use mina_p2p_messages::v2::{CurrencyFeeStableV1, NonZeroCurvePoint}; use serde::{Deserialize, Serialize}; -use super::{ +use crate::external_snark_worker::{ ExternalSnarkWorkerError, ExternalSnarkWorkerWorkError, SnarkWorkResult, SnarkWorkSpec, }; diff --git a/node/src/external_snark_worker_effectful/mod.rs b/node/src/external_snark_worker_effectful/mod.rs new file mode 100644 index 0000000000..371ec46f8d --- /dev/null +++ b/node/src/external_snark_worker_effectful/mod.rs @@ -0,0 +1,8 @@ +mod external_snark_worker_effectful_actions; +pub use external_snark_worker_effectful_actions::ExternalSnarkWorkerEffectfulAction; + +mod external_snark_worker_effectful_effects; +pub use external_snark_worker_effectful_effects::external_snark_worker_effectful_effects; + +mod external_snark_worker_service; +pub use external_snark_worker_service::*; diff --git a/node/src/lib.rs b/node/src/lib.rs index 76f23d7dbb..7e4270289a 100644 --- a/node/src/lib.rs +++ b/node/src/lib.rs @@ -35,6 +35,7 @@ pub mod consensus; pub mod daemon_json; pub mod event_source; pub mod external_snark_worker; +pub mod external_snark_worker_effectful; pub mod ledger; pub mod logger; pub mod p2p; diff --git a/node/src/reducer.rs b/node/src/reducer.rs index 9b5a08befe..6b0ecef4a9 100644 --- a/node/src/reducer.rs +++ b/node/src/reducer.rs @@ -2,8 +2,8 @@ use openmina_core::{bug_condition, error, Substate}; use p2p::{P2pAction, P2pEffectfulAction, P2pInitializeAction, P2pState}; use crate::{ - rpc::RpcState, state::BlockProducerState, Action, ActionWithMeta, ConsensusAction, - EventSourceAction, P2p, State, + external_snark_worker::ExternalSnarkWorkers, rpc::RpcState, state::BlockProducerState, Action, + ActionWithMeta, ConsensusAction, EventSourceAction, P2p, State, }; pub fn reducer( @@ -86,9 +86,13 @@ pub fn reducer( BlockProducerState::reducer(Substate::new(state, dispatcher), meta.with_action(action)); } Action::BlockProducerEffectful(_) => {} - Action::ExternalSnarkWorker(a) => { - state.external_snark_worker.reducer(meta.with_action(a)); + Action::ExternalSnarkWorker(action) => { + ExternalSnarkWorkers::reducer( + Substate::new(state, dispatcher), + meta.with_action(action), + ); } + Action::ExternalSnarkWorkerEffects(_) => {} Action::Rpc(action) => { RpcState::reducer(Substate::new(state, dispatcher), meta.with_action(action)); } diff --git a/node/src/service.rs b/node/src/service.rs index c656a6e579..668cd59095 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -1,7 +1,7 @@ pub use crate::block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorService; pub use crate::block_producer_effectful::BlockProducerService; pub use crate::event_source::EventSourceService; -pub use crate::external_snark_worker::ExternalSnarkWorkerService; +pub use crate::external_snark_worker_effectful::ExternalSnarkWorkerService; pub use crate::ledger::LedgerService; pub use crate::p2p::service::*; pub use crate::recorder::Recorder; diff --git a/node/src/state.rs b/node/src/state.rs index 6dba81f5dd..f87a644f67 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -28,7 +28,7 @@ use snark::work_verify::SnarkWorkVerifyState; use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorState; pub use crate::block_producer::BlockProducerState; pub use crate::consensus::ConsensusState; -use crate::external_snark_worker::ExternalSnarkWorkers; +use crate::external_snark_worker::{ExternalSnarkWorker, ExternalSnarkWorkers}; pub use crate::ledger::LedgerState; use crate::p2p::callbacks::P2pCallbacksAction; pub use crate::p2p::P2pState; @@ -97,6 +97,7 @@ impl_substate_access!(State, ExternalSnarkWorkers, external_snark_worker); impl_substate_access!(State, BlockProducerState, block_producer); impl_substate_access!(State, RpcState, rpc); impl_substate_access!(State, WatchedAccountsState, watched_accounts); +impl_substate_access!(State, ExternalSnarkWorker, external_snark_worker.0); impl openmina_core::SubstateAccess for State { fn substate(&self) -> openmina_core::SubstateResult<&P2pState> { diff --git a/node/testing/src/service/mod.rs b/node/testing/src/service/mod.rs index d8597880dc..1aa535bc6a 100644 --- a/node/testing/src/service/mod.rs +++ b/node/testing/src/service/mod.rs @@ -21,7 +21,7 @@ use node::block_producer::vrf_evaluator::VrfEvaluatorInput; use node::block_producer::BlockProducerEvent; use node::core::channels::mpsc; use node::core::snark::{Snark, SnarkJobId}; -use node::external_snark_worker::ExternalSnarkWorkerEvent; +use node::external_snark_worker_effectful::ExternalSnarkWorkerEvent; use node::p2p::service_impl::webrtc_with_libp2p::P2pServiceWebrtcWithLibp2p; use node::p2p::P2pCryptoService; use node::recorder::Recorder; @@ -40,7 +40,8 @@ use node::stats::Stats; use node::transition_frontier::genesis::GenesisConfig; use node::{ event_source::Event, - external_snark_worker::{ExternalSnarkWorkerService, SnarkWorkSpec}, + external_snark_worker::SnarkWorkSpec, + external_snark_worker_effectful::ExternalSnarkWorkerService, p2p::{ connection::outgoing::P2pConnectionOutgoingInitOpts, service_impl::webrtc::{Cmd, P2pServiceWebrtc, PeerState}, From 961f041190bfeb0433905bbf935abf6e58ad31e1 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Thu, 21 Nov 2024 19:18:06 +0400 Subject: [PATCH 084/175] fix(native/p2p/webrtc): http outgoing signaling not working --- Cargo.lock | 1 - p2p/Cargo.toml | 2 +- p2p/src/service_impl/webrtc/native.rs | 18 ++++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c5dfd00aea..d1f047edb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4921,7 +4921,6 @@ dependencies = [ "gloo-utils", "hex", "hkdf", - "hyper 0.14.27", "js-sys", "libc", "libp2p-identity", diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 17e09e4a1c..089d9c2009 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -69,7 +69,7 @@ p2p-testing = { path = "testing" } redux = { workspace = true, features=["serializable_callbacks"] } tokio = { version = "1.26", features = ["rt"] } webrtc = { git = "https://github.com/openmina/webrtc.git", branch = "openmina-v0.11.0", optional = true } -hyper = { version = "0.14.25", features = ["client", "http1", "tcp"] } +reqwest = { version = "0.11", features = ["json"] } mio = { version = "0.8.11", features = ["os-poll", "net"] } libc = { version = "0.2.151" } local-ip-address = "0.6.1" diff --git a/p2p/src/service_impl/webrtc/native.rs b/p2p/src/service_impl/webrtc/native.rs index 1cbd06db8c..703e3a349f 100644 --- a/p2p/src/service_impl/webrtc/native.rs +++ b/p2p/src/service_impl/webrtc/native.rs @@ -35,9 +35,7 @@ pub enum RTCSignalingError { #[error("serialization failed: {0}")] Serialize(serde_json::Error), #[error("http request failed: {0}")] - Hyper(hyper::Error), - #[error("http request failed: {0}")] - Http(hyper::http::Error), + Http(reqwest::Error), } impl RTCConnection { @@ -165,11 +163,15 @@ pub async fn webrtc_signal_send( url: &str, offer: Offer, ) -> std::result::Result { - let client = hyper::Client::new(); - let req = hyper::Request::post(url).body(serde_json::to_string(&offer)?.into())?; - let body = client.request(req).await?.into_body(); - let bytes = hyper::body::to_bytes(body).await?; - Ok(serde_json::from_slice(bytes.as_ref())?) + let client = reqwest::Client::new(); + let res = client + .post(url) + .body(serde_json::to_string(&offer)?) + .send() + .await? + .json() + .await?; + Ok(res) } impl Clone for RTCConnection { From 602cc2579f767c7982e076afad6dbc372de23f4e Mon Sep 17 00:00:00 2001 From: Adrian Nagy Date: Thu, 21 Nov 2024 16:20:48 +0100 Subject: [PATCH 085/175] feat: vrf evaluator stats --- .../block_producer_vrf_evaluator_reducer.rs | 3 ++ ...roducer_vrf_evaluator_effectful_actions.rs | 1 + ...roducer_vrf_evaluator_effectful_effects.rs | 5 ++++ node/src/rpc/mod.rs | 7 ++++- .../rpc_effectful/rpc_effectful_effects.rs | 8 +++++ node/src/stats/stats_block_producer.rs | 30 ++++++++++++++++++- 6 files changed, 52 insertions(+), 2 deletions(-) diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs index cb652384a7..dc0f21e238 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs @@ -64,6 +64,9 @@ impl BlockProducerVrfEvaluatorState { if let Some(vrf_evaluator_state) = state.block_producer.vrf_evaluator() { if let Some(pending_evaluation) = vrf_evaluator_state.current_evaluation() { + dispatcher.push(BlockProducerVrfEvaluatorEffectfulAction::SlotEvaluated { + epoch: pending_evaluation.epoch_number, + }); dispatcher.push(BlockProducerVrfEvaluatorAction::CheckEpochBounds { epoch_number: pending_evaluation.epoch_number, latest_evaluated_global_slot: vrf_output.global_slot(), diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs index 01fcf6f521..ed5eeebf6c 100644 --- a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs @@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] pub enum BlockProducerVrfEvaluatorEffectfulAction { EvaluateSlot { vrf_input: VrfEvaluatorInput }, + SlotEvaluated { epoch: u32 }, } impl redux::EnablingCondition for BlockProducerVrfEvaluatorEffectfulAction { diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs index 1a0d6bf41c..09d7f62c23 100644 --- a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs @@ -10,6 +10,11 @@ impl BlockProducerVrfEvaluatorEffectfulAction { BlockProducerVrfEvaluatorEffectfulAction::EvaluateSlot { vrf_input } => { store.service.evaluate(vrf_input); } + BlockProducerVrfEvaluatorEffectfulAction::SlotEvaluated { epoch } => { + if let Some(stats) = store.service.stats() { + stats.block_producer().increment_slot_evaluated(epoch); + } + } } } } diff --git a/node/src/rpc/mod.rs b/node/src/rpc/mod.rs index 089c4e1230..f236bb3ff6 100644 --- a/node/src/rpc/mod.rs +++ b/node/src/rpc/mod.rs @@ -45,7 +45,9 @@ use crate::p2p::connection::outgoing::P2pConnectionOutgoingInitOpts; use crate::p2p::PeerId; use crate::snark_pool::{JobCommitment, JobSummary}; use crate::stats::actions::{ActionStatsForBlock, ActionStatsSnapshot}; -use crate::stats::block_producer::{BlockProductionAttempt, BlockProductionAttemptWonSlot}; +use crate::stats::block_producer::{ + BlockProductionAttempt, BlockProductionAttemptWonSlot, VrfEvaluatorStats, +}; use crate::stats::sync::SyncStatsSnapshot; #[derive(Serialize, Deserialize, Debug, Clone)] @@ -492,10 +494,13 @@ pub struct RpcNodeStatusSnarkPool { pub struct RpcBlockProducerStats { pub current_time: redux::Timestamp, pub current_global_slot: Option, + pub current_epoch: Option, pub epoch_start: Option, pub epoch_end: Option, pub attempts: Vec, pub future_won_slots: Vec, + pub current_epoch_vrf_stats: Option, + pub vrf_stats: BTreeMap, } #[derive(Serialize, Deserialize, Debug, Clone)] diff --git a/node/src/rpc_effectful/rpc_effectful_effects.rs b/node/src/rpc_effectful/rpc_effectful_effects.rs index 251ea96bc4..d728a9348d 100644 --- a/node/src/rpc_effectful/rpc_effectful_effects.rs +++ b/node/src/rpc_effectful/rpc_effectful_effects.rs @@ -143,6 +143,7 @@ pub fn rpc_effects(store: &mut Store, action: ActionWithMeta(store: &mut Store, action: ActionWithMeta, + pub vrf_evaluator: BTreeMap, } #[derive(Serialize, Deserialize, Debug, Clone)] @@ -90,6 +91,22 @@ pub struct ProducedBlockTransactions { pub zkapps: u16, } +// TODO(adonagy): distinguish between current and next epoch +#[derive(Serialize, Deserialize, Debug, Clone)] +pub struct VrfEvaluatorStats { + pub total_slots: u32, + pub evaluated_slots: u32, +} + +impl Default for VrfEvaluatorStats { + fn default() -> Self { + Self { + total_slots: 7140, // TODO(adonagy): get this from constants + evaluated_slots: 0, + } + } +} + impl BlockProducerStats { fn latest_attempt_block_hash_matches(&self, hash: &BlockHash) -> bool { self.attempts @@ -330,6 +347,17 @@ impl BlockProducerStats { false } } + + pub fn increment_slot_evaluated(&mut self, epoch: u32) { + self.vrf_evaluator + .entry(epoch) + .and_modify(|v| v.evaluated_slots = v.evaluated_slots.checked_add(1).expect("overflow")) + .or_insert_with(|| { + let mut stats = VrfEvaluatorStats::default(); + stats.evaluated_slots = 1; + stats + }); + } } impl From<&BlockProducerWonSlot> for BlockProductionAttemptWonSlot { From c40a12b078bd12f74010dbf63b6e1c485b9cf30d Mon Sep 17 00:00:00 2001 From: Mimir Date: Thu, 21 Nov 2024 15:59:54 +0100 Subject: [PATCH 086/175] Ported ledger --- node/src/action.rs | 3 + node/src/action_kind.rs | 17 +- node/src/effects.rs | 35 +- node/src/ledger/ledger_actions.rs | 1 - node/src/ledger/ledger_event.rs | 6 +- node/src/ledger/ledger_manager.rs | 30 +- node/src/ledger/ledger_reducer.rs | 19 +- node/src/ledger/ledger_service.rs | 69 +-- node/src/ledger/ledger_state.rs | 12 +- node/src/ledger/mod.rs | 4 +- node/src/ledger/read/ledger_read_actions.rs | 1 - node/src/ledger/read/ledger_read_reducer.rs | 413 +++++++++++++++++- node/src/ledger/write/ledger_write_actions.rs | 1 - node/src/ledger/write/ledger_write_reducer.rs | 148 ++++++- .../ledger_effectful_actions.rs | 27 ++ .../ledger_effectful_effects.rs | 60 +++ node/src/ledger_effectful/mod.rs | 5 + node/src/lib.rs | 1 + node/src/reducer.rs | 11 +- node/src/state.rs | 5 + 20 files changed, 753 insertions(+), 115 deletions(-) create mode 100644 node/src/ledger_effectful/ledger_effectful_actions.rs create mode 100644 node/src/ledger_effectful/ledger_effectful_effects.rs create mode 100644 node/src/ledger_effectful/mod.rs diff --git a/node/src/action.rs b/node/src/action.rs index 87b0c15071..56c7d48394 100644 --- a/node/src/action.rs +++ b/node/src/action.rs @@ -11,6 +11,7 @@ pub use crate::event_source::EventSourceAction; pub use crate::external_snark_worker::ExternalSnarkWorkerAction; use crate::external_snark_worker_effectful::ExternalSnarkWorkerEffectfulAction; pub use crate::ledger::LedgerAction; +use crate::ledger_effectful::LedgerEffectfulAction; use crate::p2p::callbacks::P2pCallbacksAction; pub use crate::p2p::P2pAction; pub use crate::rpc::RpcAction; @@ -41,6 +42,7 @@ pub enum Action { P2pCallbacks(P2pCallbacksAction), Ledger(LedgerAction), + LedgerEffects(LedgerEffectfulAction), Snark(SnarkAction), Consensus(ConsensusAction), TransitionFrontier(TransitionFrontierAction), @@ -89,6 +91,7 @@ impl redux::EnablingCondition for Action { .ready() .map_or(false, |state| a.is_enabled(state, time)), Action::Ledger(a) => a.is_enabled(state, time), + Action::LedgerEffects(a) => a.is_enabled(state, time), Action::Snark(a) => a.is_enabled(&state.snark, time), Action::Consensus(a) => a.is_enabled(state, time), Action::TransitionFrontier(a) => a.is_enabled(state, time), diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 6ed3c79b7e..dae7b3517d 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -26,6 +26,7 @@ use crate::external_snark_worker_effectful::ExternalSnarkWorkerEffectfulAction; use crate::ledger::read::LedgerReadAction; use crate::ledger::write::LedgerWriteAction; use crate::ledger::LedgerAction; +use crate::ledger_effectful::LedgerEffectfulAction; use crate::p2p::callbacks::P2pCallbacksAction; use crate::p2p::channels::best_tip::P2pChannelsBestTipAction; use crate::p2p::channels::best_tip_effectful::P2pChannelsBestTipEffectfulAction; @@ -190,6 +191,9 @@ pub enum ActionKind { ExternalSnarkWorkerEffectfulKill, ExternalSnarkWorkerEffectfulStart, ExternalSnarkWorkerEffectfulSubmitWork, + LedgerEffectfulReadInit, + LedgerEffectfulWriteInit, + LedgerEffectfulWriteSuccess, LedgerReadFindTodos, LedgerReadInit, LedgerReadPending, @@ -711,7 +715,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 595; + pub const COUNT: u16 = 598; } impl std::fmt::Display for ActionKind { @@ -729,6 +733,7 @@ impl ActionKindGet for Action { Self::P2pEffectful(a) => a.kind(), Self::P2pCallbacks(a) => a.kind(), Self::Ledger(a) => a.kind(), + Self::LedgerEffects(a) => a.kind(), Self::Snark(a) => a.kind(), Self::Consensus(a) => a.kind(), Self::TransitionFrontier(a) => a.kind(), @@ -825,6 +830,16 @@ impl ActionKindGet for LedgerAction { } } +impl ActionKindGet for LedgerEffectfulAction { + fn kind(&self) -> ActionKind { + match self { + Self::WriteInit { .. } => ActionKind::LedgerEffectfulWriteInit, + Self::WriteSuccess => ActionKind::LedgerEffectfulWriteSuccess, + Self::ReadInit { .. } => ActionKind::LedgerEffectfulReadInit, + } + } +} + impl ActionKindGet for SnarkAction { fn kind(&self) -> ActionKind { match self { diff --git a/node/src/effects.rs b/node/src/effects.rs index 86be10df86..ae16ba44dd 100644 --- a/node/src/effects.rs +++ b/node/src/effects.rs @@ -5,8 +5,8 @@ use crate::block_producer::BlockProducerAction; use crate::block_producer_effectful::block_producer_effects; use crate::event_source::event_source_effects; use crate::external_snark_worker_effectful::external_snark_worker_effectful_effects; -use crate::ledger::ledger_effects; use crate::ledger::read::LedgerReadAction; +use crate::ledger_effectful::ledger_effectful_effects; use crate::logger::logger_effects; use crate::p2p::node_p2p_effects; use crate::rpc_effectful::rpc_effects; @@ -64,10 +64,6 @@ pub fn effects(store: &mut Store, action: ActionWithMeta) { Action::Snark(action) => { snark_effects(store, meta.with_action(action)); } - Action::Consensus(_) => { - // Handled by reducer - } - Action::TransactionPool(_action) => {} Action::TransactionPoolEffect(action) => { action.effects(store); } @@ -77,36 +73,31 @@ pub fn effects(store: &mut Store, action: ActionWithMeta) { Action::P2pEffectful(action) => { node_p2p_effects(store, meta.with_action(action)); } - Action::Ledger(action) => { - ledger_effects(store, meta.with_action(action)); + Action::LedgerEffects(action) => { + ledger_effectful_effects(store, meta.with_action(action)); } - Action::SnarkPool(_) => {} Action::SnarkPoolEffect(action) => { snark_pool_effects(store, meta.with_action(action)); } - Action::BlockProducer(_) => {} Action::BlockProducerEffectful(action) => { block_producer_effects(store, meta.with_action(action)); } - Action::ExternalSnarkWorker(_) => { - // Handled by reducer - } Action::ExternalSnarkWorkerEffects(action) => { external_snark_worker_effectful_effects(store, meta.with_action(action)); } - Action::Rpc(_) => { - // Handled by reducer - } Action::RpcEffectful(action) => { rpc_effects(store, meta.with_action(action)); } - Action::WatchedAccounts(_) => { - // Handled by reducer - } - Action::P2pCallbacks(_) => { - // Handled by reducer - } - Action::P2p(_) => { + Action::BlockProducer(_) + | Action::SnarkPool(_) + | Action::ExternalSnarkWorker(_) + | Action::TransactionPool(_) + | Action::Consensus(_) + | Action::Ledger(_) + | Action::Rpc(_) + | Action::WatchedAccounts(_) + | Action::P2pCallbacks(_) + | Action::P2p(_) => { // Handled by reducer } } diff --git a/node/src/ledger/ledger_actions.rs b/node/src/ledger/ledger_actions.rs index a64022c368..32367f5762 100644 --- a/node/src/ledger/ledger_actions.rs +++ b/node/src/ledger/ledger_actions.rs @@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize}; use super::{read::LedgerReadAction, write::LedgerWriteAction}; -pub type LedgerActionWithMeta = redux::ActionWithMeta; pub type LedgerActionWithMetaRef<'a> = redux::ActionWithMeta<&'a LedgerAction>; #[derive(Serialize, Deserialize, derive_more::From, Debug, Clone)] diff --git a/node/src/ledger/ledger_event.rs b/node/src/ledger/ledger_event.rs index c5531a691c..b91e5a5f82 100644 --- a/node/src/ledger/ledger_event.rs +++ b/node/src/ledger/ledger_event.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; -use super::read::{LedgerReadId, LedgerReadResponse}; -use super::write::LedgerWriteResponse; +use super::{ + read::{LedgerReadId, LedgerReadResponse}, + write::LedgerWriteResponse, +}; #[derive(Serialize, Deserialize, Debug, Clone)] pub enum LedgerEvent { diff --git a/node/src/ledger/ledger_manager.rs b/node/src/ledger/ledger_manager.rs index 064cf6d5e3..99318272f9 100644 --- a/node/src/ledger/ledger_manager.rs +++ b/node/src/ledger/ledger_manager.rs @@ -1,20 +1,20 @@ -use std::collections::BTreeMap; - -use ledger::staged_ledger::staged_ledger::{SkipVerification, StagedLedger}; +use super::{ + read::{LedgerReadId, LedgerReadRequest, LedgerReadResponse}, + write::{LedgerWriteRequest, LedgerWriteResponse}, + {LedgerCtx, LedgerService}, +}; +use crate::{ + account::AccountPublicKey, ledger::LedgerAddress, rpc::AccountQuery, + transition_frontier::sync::ledger::snarked::TransitionFrontierSyncLedgerSnarkedService, +}; +use ledger::{ + staged_ledger::staged_ledger::{SkipVerification, StagedLedger}, + Account, AccountId, Mask, +}; use mina_p2p_messages::v2::{self, LedgerHash, MinaBaseAccountBinableArgStableV2}; -use openmina_core::channels::mpsc; -use openmina_core::thread; - -use super::ledger_service::LedgerCtx; -use super::read::{LedgerReadId, LedgerReadRequest, LedgerReadResponse}; -use super::write::{LedgerWriteRequest, LedgerWriteResponse}; -use super::LedgerService; -use crate::account::AccountPublicKey; -use crate::ledger::LedgerAddress; -use crate::rpc::AccountQuery; -use crate::transition_frontier::sync::ledger::snarked::TransitionFrontierSyncLedgerSnarkedService; -use ledger::{Account, AccountId, Mask}; use mina_signer::CompressedPubKey; +use openmina_core::{channels::mpsc, thread}; +use std::collections::BTreeMap; /// The type enumerating different requests that can be made to the /// service. Each specific constructor has a specific response diff --git a/node/src/ledger/ledger_reducer.rs b/node/src/ledger/ledger_reducer.rs index 2dddab45e2..cd5e3a2eff 100644 --- a/node/src/ledger/ledger_reducer.rs +++ b/node/src/ledger/ledger_reducer.rs @@ -1,11 +1,22 @@ -use super::{LedgerAction, LedgerActionWithMetaRef, LedgerState}; +use crate::Substate; + +use super::{ + read::LedgerReadState, write::LedgerWriteState, LedgerAction, LedgerActionWithMetaRef, + LedgerState, +}; impl LedgerState { - pub fn reducer(&mut self, action: LedgerActionWithMetaRef<'_>) { + pub fn reducer(state_context: Substate, action: LedgerActionWithMetaRef<'_>) { let (action, meta) = action.split(); match action { - LedgerAction::Write(a) => self.write.reducer(meta.with_action(a)), - LedgerAction::Read(a) => self.read.reducer(meta.with_action(a)), + LedgerAction::Write(action) => LedgerWriteState::reducer( + Substate::from_compatible_substate(state_context), + meta.with_action(action), + ), + LedgerAction::Read(action) => LedgerReadState::reducer( + Substate::from_compatible_substate(state_context), + meta.with_action(action), + ), } } } diff --git a/node/src/ledger/ledger_service.rs b/node/src/ledger/ledger_service.rs index 89366f6d88..af633992f5 100644 --- a/node/src/ledger/ledger_service.rs +++ b/node/src/ledger/ledger_service.rs @@ -1,12 +1,29 @@ -use std::{ - collections::{BTreeMap, BTreeSet}, - path::Path, - sync::Arc, -}; - use super::{ - ledger_manager::{LedgerManager, LedgerRequest}, - write::BlockApplyResult, + ledger_empty_hash_at_depth, + read::LedgerReadResponse, + read::{LedgerReadId, LedgerReadRequest}, + write::CommitResult, + write::LedgerWriteRequest, + write::LedgerWriteResponse, + LedgerAddress, LedgerEvent, LEDGER_DEPTH, +}; +use crate::{ + account::AccountPublicKey, + block_producer_effectful::StagedLedgerDiffCreateOutput, + ledger::{ + ledger_manager::{LedgerManager, LedgerRequest}, + write::BlockApplyResult, + }, + p2p::channels::rpc::StagedLedgerAuxAndPendingCoinbases, + rpc::{ + RpcScanStateSummaryBlockTransaction, RpcScanStateSummaryScanStateJob, + RpcScanStateSummaryScanStateJobKind, RpcSnarkPoolJobSnarkWorkDone, + }, + transition_frontier::genesis::empty_pending_coinbase_hash, + transition_frontier::sync::{ + ledger::staged::StagedLedgerAuxAndPendingCoinbasesValid, + TransitionFrontierRootSnarkedLedgerUpdates, + }, }; use ark_ff::fields::arithmetic::InvalidBigInt; use ledger::{ @@ -42,34 +59,18 @@ use mina_p2p_messages::{ StateHash, }, }; -use openmina_core::snark::{Snark, SnarkJobId}; -use openmina_core::thread; -use openmina_core::{block::AppliedBlock, constants::constraint_constants}; - use mina_signer::CompressedPubKey; -use openmina_core::block::ArcBlockWithHash; - -use crate::block_producer_effectful::StagedLedgerDiffCreateOutput; -use crate::p2p::channels::rpc::StagedLedgerAuxAndPendingCoinbases; -use crate::rpc::{ - RpcScanStateSummaryBlockTransaction, RpcScanStateSummaryScanStateJob, - RpcScanStateSummaryScanStateJobKind, RpcSnarkPoolJobSnarkWorkDone, -}; -use crate::transition_frontier::sync::{ - ledger::staged::StagedLedgerAuxAndPendingCoinbasesValid, - TransitionFrontierRootSnarkedLedgerUpdates, -}; -use crate::{account::AccountPublicKey, transition_frontier::genesis::empty_pending_coinbase_hash}; - -use super::write::CommitResult; - -use super::{ - ledger_empty_hash_at_depth, read::LedgerReadResponse, write::LedgerWriteResponse, - LedgerAddress, LedgerEvent, LEDGER_DEPTH, +use openmina_core::{ + block::AppliedBlock, + block::ArcBlockWithHash, + constants::constraint_constants, + snark::{Snark, SnarkJobId}, + thread, }; -use super::{ - read::{LedgerReadId, LedgerReadRequest}, - write::LedgerWriteRequest, +use std::{ + collections::{BTreeMap, BTreeSet}, + path::Path, + sync::Arc, }; fn merkle_root(mask: &mut Mask) -> LedgerHash { diff --git a/node/src/ledger/ledger_state.rs b/node/src/ledger/ledger_state.rs index 2daaf6982d..8f92156bd2 100644 --- a/node/src/ledger/ledger_state.rs +++ b/node/src/ledger/ledger_state.rs @@ -1,10 +1,7 @@ +use super::{read::LedgerReadState, write::LedgerWriteState, LedgerConfig}; use serde::{Deserialize, Serialize}; -use super::read::LedgerReadState; -use super::write::LedgerWriteState; -use super::LedgerConfig; - -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, Default)] pub struct LedgerState { pub write: LedgerWriteState, pub read: LedgerReadState, @@ -12,9 +9,6 @@ pub struct LedgerState { impl LedgerState { pub fn new(_config: LedgerConfig) -> Self { - Self { - write: Default::default(), - read: Default::default(), - } + Self::default() } } diff --git a/node/src/ledger/mod.rs b/node/src/ledger/mod.rs index 137fc97c98..d30ba68896 100644 --- a/node/src/ledger/mod.rs +++ b/node/src/ledger/mod.rs @@ -16,11 +16,9 @@ pub use ledger_state::*; mod ledger_reducer; -mod ledger_effects; -pub use ledger_effects::*; - mod ledger_service; pub use ledger_service::*; + pub mod ledger_manager; pub use ledger::AccountIndex as LedgerAccountIndex; diff --git a/node/src/ledger/read/ledger_read_actions.rs b/node/src/ledger/read/ledger_read_actions.rs index 7d9689952a..b286585c83 100644 --- a/node/src/ledger/read/ledger_read_actions.rs +++ b/node/src/ledger/read/ledger_read_actions.rs @@ -5,7 +5,6 @@ use super::{ LedgerReadResponse, }; -pub type LedgerReadActionWithMeta = redux::ActionWithMeta; pub type LedgerReadActionWithMetaRef<'a> = redux::ActionWithMeta<&'a LedgerReadAction>; #[derive(Serialize, Deserialize, Debug, Clone)] diff --git a/node/src/ledger/read/ledger_read_reducer.rs b/node/src/ledger/read/ledger_read_reducer.rs index 1b51861a52..31ebf8cf99 100644 --- a/node/src/ledger/read/ledger_read_reducer.rs +++ b/node/src/ledger/read/ledger_read_reducer.rs @@ -1,20 +1,419 @@ -use super::{LedgerReadAction, LedgerReadActionWithMetaRef, LedgerReadState}; +use mina_p2p_messages::v2; +use openmina_core::requests::RequestId; +use p2p::{ + channels::{ + rpc::{P2pChannelsRpcAction, P2pRpcId, P2pRpcRequest, P2pRpcResponse}, + streaming_rpc::{P2pChannelsStreamingRpcAction, P2pStreamingRpcRequest}, + }, + P2pAction, PeerId, +}; +use redux::Dispatcher; + +use crate::{ + block_producer::vrf_evaluator::BlockProducerVrfEvaluatorAction, + ledger_effectful::LedgerEffectfulAction, Action, RpcAction, State, Substate, +}; + +use super::{ + LedgerAddress, LedgerReadAction, LedgerReadActionWithMetaRef, LedgerReadIdType, + LedgerReadInitCallback, LedgerReadRequest, LedgerReadResponse, + LedgerReadStagedLedgerAuxAndPendingCoinbases, LedgerReadState, +}; impl LedgerReadState { - pub fn reducer(&mut self, action: LedgerReadActionWithMetaRef<'_>) { + pub fn reducer(mut state_context: Substate, action: LedgerReadActionWithMetaRef<'_>) { let (action, meta) = action.split(); + let Ok(ledger_read_state) = state_context.get_substate_mut() else { + return; + }; + match action { - LedgerReadAction::FindTodos => {} - LedgerReadAction::Init { .. } => {} + LedgerReadAction::FindTodos => { + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + Self::next_read_requests_init(dispatcher, state); + } + LedgerReadAction::Init { request, callback } => { + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + if state.ledger.read.has_same_request(request) { + return; + } + + let id = state.ledger.read.next_req_id(); + dispatcher.push(LedgerEffectfulAction::ReadInit { + request: request.clone(), + callback: callback.clone(), + id, + }); + } LedgerReadAction::Pending { request, .. } => { - self.add(meta.time(), request.clone()); + ledger_read_state.add(meta.time(), request.clone()); } LedgerReadAction::Success { id, response } => { - self.add_response(*id, meta.time(), response.clone()); + ledger_read_state.add_response(*id, meta.time(), response.clone()); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + Self::propagate_read_response(dispatcher, state, *id, response.clone()); + dispatcher.push(LedgerReadAction::Prune { id: *id }); } LedgerReadAction::Prune { id } => { - self.remove(*id); + ledger_read_state.remove(*id); + } + } + } + + fn propagate_read_response( + dispatcher: &mut Dispatcher, + state: &State, + id: RequestId, + response: LedgerReadResponse, + ) { + let Some(request) = state.ledger.read.get(id) else { + return; + }; + + match (request.request(), response) { + ( + LedgerReadRequest::DelegatorTable(ledger_hash, pub_key), + LedgerReadResponse::DelegatorTable(table), + ) => { + let expected = state.block_producer.vrf_delegator_table_inputs(); + if !expected.map_or(false, |(expected_hash, producer)| { + ledger_hash == expected_hash && pub_key == producer + }) { + eprintln!("delegator table unexpected"); + return; + } + match table { + None => { + // TODO(tizoc): Revise this, may be better to dispatch a different action here + // and avoid running the VRF evaluator altogether when we know that the + // table is empty. + dispatcher.push( + BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { + delegator_table: Default::default(), + }, + ); + } + Some(table) => { + dispatcher.push( + BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { + delegator_table: table.into(), + }, + ); + } + } + } + (_, LedgerReadResponse::DelegatorTable(..)) => unreachable!(), + (req, LedgerReadResponse::GetNumAccounts(resp)) => { + for (peer_id, id, _) in find_peers_with_ledger_rpc(state, req) { + dispatcher.push(P2pChannelsRpcAction::ResponseSend { + peer_id, + id, + response: resp.as_ref().map(|(num_accounts, hash)| { + Box::new(P2pRpcResponse::LedgerQuery( + v2::MinaLedgerSyncLedgerAnswerStableV2::NumAccounts( + (*num_accounts).into(), + hash.clone(), + ), + )) + }), + }); + } + } + (req, LedgerReadResponse::GetChildHashesAtAddr(resp)) => { + for (peer_id, id, _) in find_peers_with_ledger_rpc(state, req) { + dispatcher.push(P2pChannelsRpcAction::ResponseSend { + peer_id, + id, + response: resp.as_ref().map(|(left, right)| { + Box::new(P2pRpcResponse::LedgerQuery( + v2::MinaLedgerSyncLedgerAnswerStableV2::ChildHashesAre( + left.clone(), + right.clone(), + ), + )) + }), + }); + } + } + (req, LedgerReadResponse::GetChildAccountsAtAddr(resp)) => { + for (peer_id, id, _) in find_peers_with_ledger_rpc(state, req) { + dispatcher.push(P2pChannelsRpcAction::ResponseSend { + peer_id, + id, + response: resp.as_ref().map(|accounts| { + Box::new(P2pRpcResponse::LedgerQuery( + v2::MinaLedgerSyncLedgerAnswerStableV2::ContentsAre( + accounts.iter().cloned().collect(), + ), + )) + }), + }); + } + } + (req, LedgerReadResponse::GetStagedLedgerAuxAndPendingCoinbases(resp)) => { + for (peer_id, id, is_streaming) in find_peers_with_ledger_rpc(state, req) { + if is_streaming { + dispatcher.push(P2pChannelsStreamingRpcAction::ResponseSendInit { + peer_id, + id, + response: resp.clone().map(Into::into), + }); + } else { + dispatcher.push(P2pChannelsRpcAction::ResponseSend { + peer_id, + id, + response: resp.clone().map(|data| { + Box::new(P2pRpcResponse::StagedLedgerAuxAndPendingCoinbasesAtBlock( + data, + )) + }), + }); + } + } + } + ( + LedgerReadRequest::ScanStateSummary(ledger_hash), + LedgerReadResponse::ScanStateSummary(scan_state), + ) => { + for rpc_id in state + .rpc + .scan_state_summary_rpc_ids() + .filter(|(_, hash, _)| *hash == ledger_hash) + .map(|(id, ..)| id) + .collect::>() + { + dispatcher.push(RpcAction::ScanStateSummaryGetSuccess { + rpc_id, + scan_state: scan_state.clone(), + }); + } + } + (_, LedgerReadResponse::ScanStateSummary(..)) => unreachable!(), + (_req, LedgerReadResponse::GetAccounts(..)) => todo!(), + (_, LedgerReadResponse::AccountsForRpc(rpc_id, accounts, account_query)) => { + dispatcher.push(RpcAction::LedgerAccountsGetSuccess { + rpc_id, + accounts, + account_query, + }); + } + } + } + + fn next_read_requests_init(dispatcher: &mut Dispatcher, state: &State) { + // fetching delegator table + dispatcher.push(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); + + // p2p rpcs + let mut peers = state + .p2p + .ready_peers_iter() + .filter(|(_, peer)| { + peer.channels + .rpc + .remote_todo_requests_iter() + .next() + .is_some() + || peer.channels.streaming_rpc.remote_todo_request().is_some() + }) + .map(|(peer_id, peer)| (*peer_id, peer.channels.rpc_remote_last_responded())) + .collect::>(); + peers.sort_by_key(|(_, last_responded)| *last_responded); + for (peer_id, _) in peers { + let Some((id, request, is_streaming)) = None.or_else(|| { + let peer = state.p2p.ready()?.get_ready_peer(&peer_id)?; + let mut reqs = peer.channels.rpc.remote_todo_requests_iter(); + reqs.find_map(|req| { + let ledger_request = match &req.request { + P2pRpcRequest::LedgerQuery(hash, query) => match query { + v2::MinaLedgerSyncLedgerQueryStableV1::NumAccounts => { + LedgerReadRequest::GetNumAccounts(hash.clone()) + } + v2::MinaLedgerSyncLedgerQueryStableV1::WhatChildHashes(addr) => { + LedgerReadRequest::GetChildHashesAtAddr(hash.clone(), addr.into()) + } + v2::MinaLedgerSyncLedgerQueryStableV1::WhatContents(addr) => { + LedgerReadRequest::GetChildAccountsAtAddr(hash.clone(), addr.into()) + } + }, + P2pRpcRequest::StagedLedgerAuxAndPendingCoinbasesAtBlock(block_hash) => { + build_staged_ledger_parts_request(state, block_hash)? + } + _ => return None, + }; + + Some((req.id, ledger_request, false)) + }) + .or_else(|| { + let (id, req) = peer.channels.streaming_rpc.remote_todo_request()?; + let ledger_request = match req { + P2pStreamingRpcRequest::StagedLedgerParts(block_hash) => { + build_staged_ledger_parts_request(state, block_hash)? + } + }; + Some((id, ledger_request, true)) + }) + }) else { + continue; + }; + + dispatcher.push(LedgerReadAction::Init { + request, + callback: LedgerReadInitCallback::P2pChannelsResponsePending + { callback: redux::callback!(on_ledger_read_init_p2p_channels_response_pending((is_streaming: bool, id: P2pRpcId, peer_id: PeerId)) -> crate::Action{ + if is_streaming { + P2pAction::from(P2pChannelsStreamingRpcAction::ResponsePending { + peer_id, + id, + }) + } else { + P2pAction::from(P2pChannelsRpcAction::ResponsePending { + peer_id, + id, + }) + } + }), + args:(is_streaming, id, peer_id) + } + }); + + if !state.ledger.read.is_total_cost_under_limit() { + return; + } + } + + // rpcs + let rpcs = state + .rpc + .scan_state_summary_rpc_ids() + .filter(|(.., status)| status.is_init()) + .map(|(id, ..)| id) + .collect::>(); + + for rpc_id in rpcs { + dispatcher.push(RpcAction::ScanStateSummaryLedgerGetInit { rpc_id }); + if !state.ledger.read.is_total_cost_under_limit() { + return; + } + } + + let ledger_account_rpc = state + .rpc + .accounts_request_rpc_ids() + .filter(|(.., status)| status.is_init()) + .map(|(id, req, _)| (id, req)) + .collect::>(); + + for (rpc_id, req) in ledger_account_rpc { + dispatcher.push(RpcAction::LedgerAccountsGetInit { + rpc_id, + account_query: req, + }); + if !state.ledger.read.is_total_cost_under_limit() { + return; } } } } + +fn find_peers_with_ledger_rpc( + state: &crate::State, + req: &LedgerReadRequest, +) -> Vec<(PeerId, P2pRpcId, bool)> { + let Some(p2p) = state.p2p.ready() else { + return Vec::new(); + }; + p2p.ready_peers_iter() + .flat_map(|(peer_id, peer)| { + let rpcs = peer + .channels + .rpc + .remote_pending_requests_iter() + .map(move |req| (peer_id, req.id, &req.request)) + .filter(|(_, _, peer_req)| match (req, peer_req) { + ( + LedgerReadRequest::GetNumAccounts(h1), + P2pRpcRequest::LedgerQuery( + h2, + v2::MinaLedgerSyncLedgerQueryStableV1::NumAccounts, + ), + ) => h1 == h2, + ( + LedgerReadRequest::GetChildHashesAtAddr(h1, addr1), + P2pRpcRequest::LedgerQuery( + h2, + v2::MinaLedgerSyncLedgerQueryStableV1::WhatChildHashes(addr2), + ), + ) => h1 == h2 && addr1 == &LedgerAddress::from(addr2), + ( + LedgerReadRequest::GetChildAccountsAtAddr(h1, addr1), + P2pRpcRequest::LedgerQuery( + h2, + v2::MinaLedgerSyncLedgerQueryStableV1::WhatContents(addr2), + ), + ) => h1 == h2 && addr1 == &LedgerAddress::from(addr2), + ( + LedgerReadRequest::GetStagedLedgerAuxAndPendingCoinbases(data), + P2pRpcRequest::StagedLedgerAuxAndPendingCoinbasesAtBlock(block_hash), + ) => state + .transition_frontier + .get_state_body(block_hash) + .map_or(false, |b| { + b.blockchain_state.staged_ledger_hash == data.ledger_hash + }), + _ => false, + }) + .map(|(peer_id, rpc_id, _)| (*peer_id, rpc_id, false)); + let streaming_rpcs = peer + .channels + .streaming_rpc + .remote_pending_request() + .into_iter() + .filter(|(_, peer_req)| match (req, peer_req) { + ( + LedgerReadRequest::GetStagedLedgerAuxAndPendingCoinbases(data), + P2pStreamingRpcRequest::StagedLedgerParts(block_hash), + ) => state + .transition_frontier + .get_state_body(block_hash) + .map_or(false, |b| { + b.blockchain_state.staged_ledger_hash == data.ledger_hash + }), + _ => false, + }) + .map(|(rpc_id, _)| (*peer_id, rpc_id, true)); + rpcs.chain(streaming_rpcs) + }) + .collect() +} + +fn build_staged_ledger_parts_request( + state: &crate::State, + block_hash: &v2::StateHash, +) -> Option { + let tf = &state.transition_frontier; + let ledger_hash = tf + .best_chain + .iter() + .find(|b| b.hash() == block_hash) + .map(|b| b.staged_ledger_hashes().clone())?; + let protocol_states = tf + .needed_protocol_states + .iter() + .map(|(hash, b)| (hash.clone(), b.clone())) + .chain( + tf.best_chain + .iter() + .take_while(|b| b.hash() != block_hash) + .map(|b| (b.hash().clone(), b.header().protocol_state.clone())), + ) + .collect(); + + Some(LedgerReadRequest::GetStagedLedgerAuxAndPendingCoinbases( + LedgerReadStagedLedgerAuxAndPendingCoinbases { + ledger_hash, + protocol_states, + }, + )) +} diff --git a/node/src/ledger/write/ledger_write_actions.rs b/node/src/ledger/write/ledger_write_actions.rs index 38e594f5d3..dee32e747f 100644 --- a/node/src/ledger/write/ledger_write_actions.rs +++ b/node/src/ledger/write/ledger_write_actions.rs @@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize}; use super::{LedgerWriteRequest, LedgerWriteResponse, LedgerWriteState}; -pub type LedgerWriteActionWithMeta = redux::ActionWithMeta; pub type LedgerWriteActionWithMetaRef<'a> = redux::ActionWithMeta<&'a LedgerWriteAction>; #[derive(Serialize, Deserialize, Debug, Clone)] diff --git a/node/src/ledger/write/ledger_write_reducer.rs b/node/src/ledger/write/ledger_write_reducer.rs index fb5c9b0ddf..d53599d35f 100644 --- a/node/src/ledger/write/ledger_write_reducer.rs +++ b/node/src/ledger/write/ledger_write_reducer.rs @@ -1,34 +1,160 @@ -use super::{LedgerWriteAction, LedgerWriteActionWithMetaRef, LedgerWriteState}; +use redux::Dispatcher; + +use crate::{ + ledger_effectful::LedgerEffectfulAction, + transition_frontier::sync::{ + ledger::staged::TransitionFrontierSyncLedgerStagedAction, TransitionFrontierSyncAction, + }, + Action, BlockProducerAction, State, Substate, +}; + +use super::{ + LedgerWriteAction, LedgerWriteActionWithMetaRef, LedgerWriteResponse, LedgerWriteState, +}; impl LedgerWriteState { - pub fn reducer(&mut self, action: LedgerWriteActionWithMetaRef<'_>) { + pub fn reducer(mut state_context: Substate, action: LedgerWriteActionWithMetaRef<'_>) { let (action, meta) = action.split(); + let Ok(ledger_write_state) = state_context.get_substate_mut() else { + return; + }; + match action { - LedgerWriteAction::Init { - request, - on_init: _, - } => { - *self = Self::Init { + LedgerWriteAction::Init { request, on_init } => { + *ledger_write_state = Self::Init { time: meta.time(), request: request.clone(), }; + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(LedgerEffectfulAction::WriteInit { + request: request.clone(), + on_init: on_init.clone(), + }); } LedgerWriteAction::Pending => { - if let Self::Init { request, .. } = self { - *self = Self::Pending { + if let Self::Init { request, .. } = ledger_write_state { + *ledger_write_state = Self::Pending { time: meta.time(), request: request.clone(), }; } } LedgerWriteAction::Success { response } => { - if let Self::Pending { request, .. } = self { - *self = Self::Success { + if let Self::Pending { request, .. } = ledger_write_state { + *ledger_write_state = Self::Success { time: meta.time(), request: request.clone(), response: response.clone(), }; } + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + Self::propagate_write_response(dispatcher, state, response.clone()); + dispatcher.push(LedgerEffectfulAction::WriteSuccess); + } + } + } + + fn propagate_write_response( + dispatcher: &mut Dispatcher, + state: &State, + response: LedgerWriteResponse, + ) { + let Some(request) = &state.ledger.write.request() else { + return; + }; + match (request, response) { + ( + _, + LedgerWriteResponse::StagedLedgerReconstruct { + staged_ledger_hash, + result, + }, + ) => { + let sync = &state.transition_frontier.sync; + let expected_ledger = sync + .ledger_target() + .and_then(|target| target.staged) + .map(|v| v.hashes.non_snark.ledger_hash); + if expected_ledger.as_ref() == Some(&staged_ledger_hash) { + match result { + Err(error) => { + dispatcher.push( + TransitionFrontierSyncLedgerStagedAction::ReconstructError { + error, + }, + ); + } + Ok(()) => { + dispatcher.push( + TransitionFrontierSyncLedgerStagedAction::ReconstructSuccess { + ledger_hash: staged_ledger_hash, + }, + ); + } + } + } + } + ( + _, + LedgerWriteResponse::StagedLedgerDiffCreate { + pred_block_hash, + global_slot_since_genesis, + result, + }, + ) => { + let Some((expected_pred_block_hash, expected_global_slot)) = None.or_else(|| { + let pred_block = state.block_producer.current_parent_chain()?.last()?; + let won_slot = state.block_producer.current_won_slot()?; + let slot = won_slot.global_slot_since_genesis(pred_block.global_slot_diff()); + Some((pred_block.hash(), slot)) + }) else { + return; + }; + + if &pred_block_hash == expected_pred_block_hash + && global_slot_since_genesis == expected_global_slot + { + match result { + Err(err) => todo!("handle staged ledger diff creation err: {err}"), + Ok(output) => { + dispatcher.push(BlockProducerAction::StagedLedgerDiffCreateSuccess { + output, + }); + } + } + } + } + ( + _, + LedgerWriteResponse::BlockApply { + block_hash: hash, + result, + }, + ) => match result { + Err(error) => { + dispatcher + .push(TransitionFrontierSyncAction::BlocksNextApplyError { hash, error }); + } + Ok(result) => { + dispatcher.push(TransitionFrontierSyncAction::BlocksNextApplySuccess { + hash, + just_emitted_a_proof: result.just_emitted_a_proof, + }); + } + }, + ( + _, + LedgerWriteResponse::Commit { + best_tip_hash, + result, + }, + ) => { + let best_tip = state.transition_frontier.sync.best_tip(); + if best_tip.map_or(false, |tip| tip.hash() == &best_tip_hash) { + dispatcher.push(TransitionFrontierSyncAction::CommitSuccess { result }); + } } } } diff --git a/node/src/ledger_effectful/ledger_effectful_actions.rs b/node/src/ledger_effectful/ledger_effectful_actions.rs new file mode 100644 index 0000000000..74731b91ce --- /dev/null +++ b/node/src/ledger_effectful/ledger_effectful_actions.rs @@ -0,0 +1,27 @@ +use crate::ledger::{ + read::{LedgerReadIdType, LedgerReadInitCallback, LedgerReadRequest}, + write::LedgerWriteRequest, +}; +use openmina_core::requests::RequestId; +use redux::Callback; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, Debug, Clone)] +pub enum LedgerEffectfulAction { + WriteInit { + request: LedgerWriteRequest, + on_init: Callback, + }, + WriteSuccess, + ReadInit { + request: LedgerReadRequest, + callback: LedgerReadInitCallback, + id: RequestId, + }, +} + +impl redux::EnablingCondition for LedgerEffectfulAction { + fn is_enabled(&self, _state: &crate::State, _time: redux::Timestamp) -> bool { + true + } +} diff --git a/node/src/ledger_effectful/ledger_effectful_effects.rs b/node/src/ledger_effectful/ledger_effectful_effects.rs new file mode 100644 index 0000000000..06fbf99d24 --- /dev/null +++ b/node/src/ledger_effectful/ledger_effectful_effects.rs @@ -0,0 +1,60 @@ +use redux::ActionWithMeta; + +use crate::{ + ledger::{ + read::{LedgerReadAction, LedgerReadInitCallback}, + write::LedgerWriteAction, + LedgerService, + }, + transition_frontier::sync::{ + ledger::staged::TransitionFrontierSyncLedgerStagedAction, TransitionFrontierSyncAction, + }, + BlockProducerAction, Store, +}; + +use super::LedgerEffectfulAction; + +pub fn ledger_effectful_effects( + store: &mut Store, + action: ActionWithMeta, +) where + S: LedgerService, +{ + let (action, _meta) = action.split(); + + match action { + LedgerEffectfulAction::WriteInit { request, on_init } => { + store.service.write_init(request.clone()); + store.dispatch(LedgerWriteAction::Pending); + store.dispatch_callback(on_init, request); + } + LedgerEffectfulAction::WriteSuccess => { + if store.dispatch(BlockProducerAction::StagedLedgerDiffCreateInit) { + } else if store.dispatch(TransitionFrontierSyncAction::BlocksNextApplyInit) { + } else if store.dispatch(TransitionFrontierSyncAction::CommitInit) { + } else if store.dispatch(TransitionFrontierSyncLedgerStagedAction::ReconstructInit) { + } + } + LedgerEffectfulAction::ReadInit { + request, + callback, + id, + } => { + store.service.read_init(id, request.clone()); + store.dispatch(LedgerReadAction::Pending { id, request }); + + match callback { + LedgerReadInitCallback::RpcLedgerAccountsGetPending { callback, args } => { + store.dispatch_callback(callback, args); + } + LedgerReadInitCallback::RpcScanStateSummaryGetPending { callback, args } => { + store.dispatch_callback(callback, args); + } + LedgerReadInitCallback::P2pChannelsResponsePending { callback, args } => { + store.dispatch_callback(callback, args); + } + LedgerReadInitCallback::None => {} + } + } + } +} diff --git a/node/src/ledger_effectful/mod.rs b/node/src/ledger_effectful/mod.rs new file mode 100644 index 0000000000..c5b1f2ee46 --- /dev/null +++ b/node/src/ledger_effectful/mod.rs @@ -0,0 +1,5 @@ +mod ledger_effectful_actions; +pub use ledger_effectful_actions::LedgerEffectfulAction; + +mod ledger_effectful_effects; +pub use ledger_effectful_effects::ledger_effectful_effects; diff --git a/node/src/lib.rs b/node/src/lib.rs index 7e4270289a..38b7f2a7c4 100644 --- a/node/src/lib.rs +++ b/node/src/lib.rs @@ -37,6 +37,7 @@ pub mod event_source; pub mod external_snark_worker; pub mod external_snark_worker_effectful; pub mod ledger; +pub mod ledger_effectful; pub mod logger; pub mod p2p; pub mod rpc; diff --git a/node/src/reducer.rs b/node/src/reducer.rs index 6b0ecef4a9..060e710723 100644 --- a/node/src/reducer.rs +++ b/node/src/reducer.rs @@ -2,8 +2,10 @@ use openmina_core::{bug_condition, error, Substate}; use p2p::{P2pAction, P2pEffectfulAction, P2pInitializeAction, P2pState}; use crate::{ - external_snark_worker::ExternalSnarkWorkers, rpc::RpcState, state::BlockProducerState, Action, - ActionWithMeta, ConsensusAction, EventSourceAction, P2p, State, + external_snark_worker::ExternalSnarkWorkers, + rpc::RpcState, + state::{BlockProducerState, LedgerState}, + Action, ActionWithMeta, ConsensusAction, EventSourceAction, P2p, State, }; pub fn reducer( @@ -50,9 +52,10 @@ pub fn reducer( }, }, Action::P2pEffectful(_) => {} - Action::Ledger(a) => { - state.ledger.reducer(meta.with_action(a)); + Action::Ledger(action) => { + LedgerState::reducer(Substate::new(state, dispatcher), meta.with_action(action)); } + Action::LedgerEffects(_) => {} Action::Snark(a) => { snark::SnarkState::reducer(Substate::new(state, dispatcher), meta.with_action(a)); } diff --git a/node/src/state.rs b/node/src/state.rs index f87a644f67..73fea89b61 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -29,6 +29,8 @@ use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorState; pub use crate::block_producer::BlockProducerState; pub use crate::consensus::ConsensusState; use crate::external_snark_worker::{ExternalSnarkWorker, ExternalSnarkWorkers}; +use crate::ledger::read::LedgerReadState; +use crate::ledger::write::LedgerWriteState; pub use crate::ledger::LedgerState; use crate::p2p::callbacks::P2pCallbacksAction; pub use crate::p2p::P2pState; @@ -98,6 +100,9 @@ impl_substate_access!(State, BlockProducerState, block_producer); impl_substate_access!(State, RpcState, rpc); impl_substate_access!(State, WatchedAccountsState, watched_accounts); impl_substate_access!(State, ExternalSnarkWorker, external_snark_worker.0); +impl_substate_access!(State, LedgerState, ledger); +impl_substate_access!(State, LedgerReadState, ledger.read); +impl_substate_access!(State, LedgerWriteState, ledger.write); impl openmina_core::SubstateAccess for State { fn substate(&self) -> openmina_core::SubstateResult<&P2pState> { From 0cb8b029f64a4e0c6ede4926b4059636c5664740 Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Wed, 20 Nov 2024 12:34:01 +0200 Subject: [PATCH 087/175] Dashboard redesign Redesign dashboard Redesigning - UX features Redesign Upgrade --- frontend/README.md | 12 +- frontend/httpd.conf | 5 +- frontend/package-lock.json | 12 +- frontend/package.json | 4 +- frontend/src/app/app.component.scss | 13 +- frontend/src/app/app.effects.ts | 2 +- ...-production-won-slots-epoch.component.html | 1 + ...-production-won-slots-epoch.component.scss | 0 ...ck-production-won-slots-epoch.component.ts | 46 ++++ .../block-production-won-slots.component.html | 5 +- .../block-production-won-slots.component.scss | 13 +- .../block-production-won-slots.component.ts | 1 + .../block-production-won-slots.effects.ts | 19 +- .../block-production-won-slots.module.ts | 2 + .../block-production-won-slots.reducer.ts | 4 +- .../block-production-won-slots.service.ts | 17 +- ...-production-won-slots-cards.component.html | 25 +- ...ck-production-won-slots-cards.component.ts | 39 ++- ...uction-won-slots-side-panel.component.html | 20 +- ...uction-won-slots-side-panel.component.scss | 15 +- ...oduction-won-slots-side-panel.component.ts | 4 +- ...-production-won-slots-table.component.html | 2 +- ...-production-won-slots-table.component.scss | 19 ++ ...ck-production-won-slots-table.component.ts | 10 +- .../dashboard-blocks-sync.component.html | 50 ++-- .../dashboard-blocks-sync.component.scss | 43 +-- .../dashboard-blocks-sync.component.ts | 4 +- .../dashboard-ledger.component.html | 18 +- .../dashboard-ledger.component.scss | 55 +--- .../dashboard-ledger.component.ts | 11 +- .../dashboard-network.component.html | 34 +-- .../dashboard-network.component.scss | 61 +---- .../dashboard-network.component.ts | 1 - ...shboard-peers-minimal-table.component.scss | 1 + .../dashboard/dashboard.component.html | 18 +- .../dashboard/dashboard.component.scss | 89 ++++++- .../features/dashboard/dashboard.component.ts | 108 +++++++- .../mina-card/mina-card.component.html | 10 - .../mina-card/mina-card.component.scss | 18 -- .../mina-card/mina-card.component.ts | 21 -- .../web-node-initialization.component.html | 18 +- .../web-node-initialization.component.scss | 4 - .../web-node-initialization.component.ts | 6 +- .../block-production-pill.component.scss | 23 +- .../layout/menu-tabs/menu-tabs.component.ts | 4 +- .../src/app/layout/menu/menu.component.scss | 1 - .../server-status.component.html | 6 +- .../server-status.component.scss | 2 +- .../server-status/server-status.component.ts | 3 +- .../src/app/layout/toolbar/loading.reducer.ts | 35 +-- .../app/layout/toolbar/toolbar.component.html | 10 +- .../app/layout/toolbar/toolbar.component.scss | 9 +- .../app/layout/toolbar/toolbar.component.ts | 5 +- .../mina-table-rust-wrapper.class.ts | 2 +- .../base-classes/mina-table-wrapper.class.ts | 33 +++ .../mina-card/mina-card.component.ts | 2 +- .../mina-table/mina-table.component.html | 57 ++++ .../mina-table/mina-table.component.scss | 251 ++++++++++++++++++ .../mina-table/mina-table.component.ts | 156 +++++++++++ frontend/src/assets/styles/openmina.scss | 176 +----------- frontend/src/environments/environment.ts | 56 ++-- frontend/src/index.html | 6 +- 62 files changed, 1059 insertions(+), 638 deletions(-) create mode 100644 frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.html create mode 100644 frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.scss create mode 100644 frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.ts delete mode 100644 frontend/src/app/features/dashboard/mina-card/mina-card.component.html delete mode 100644 frontend/src/app/features/dashboard/mina-card/mina-card.component.scss delete mode 100644 frontend/src/app/features/dashboard/mina-card/mina-card.component.ts create mode 100644 frontend/src/app/shared/base-classes/mina-table-wrapper.class.ts create mode 100644 frontend/src/app/shared/components/mina-table/mina-table.component.html create mode 100644 frontend/src/app/shared/components/mina-table/mina-table.component.scss create mode 100644 frontend/src/app/shared/components/mina-table/mina-table.component.ts diff --git a/frontend/README.md b/frontend/README.md index ded497ce4c..7bff8ff863 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -4,13 +4,13 @@ This is a simple Angular application that will help you to see the behaviour of ## Prerequisites -### 1. Node.js v20.11.1 +### 1. Node.js v23.1.0 #### MacOS ```bash /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" -brew install node@20.11.1 +brew install node@23.1.0 ``` #### Linux @@ -18,17 +18,17 @@ brew install node@20.11.1 ```bash curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash source ~/.bashrc -nvm install 20.11.1 +nvm install 23.1.0 ``` #### Windows -Download [Node.js v20.11.1](https://nodejs.org/) from the official website, open the installer and follow the prompts to complete the installation. +Download [Node.js v23.1.0](https://nodejs.org/) from the official website, open the installer and follow the prompts to complete the installation. -### 2. Angular CLI v16.2.0 +### 2. Angular CLI v17.3.0 ```bash -npm install -g @angular/cli@16.2.0 +npm install -g @angular/cli@17.3.0 ``` ### 3. Installation diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 4112d112d5..168d4180cf 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -211,9 +211,8 @@ LoadModule rewrite_module modules/mod_rewrite.so RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d RewriteRule ^ - [L] - # If the requested resource doesn't exist, use index.html - RewriteCond %{REQUEST_URI} ^/index\.html$ - RewriteRule ^(.*)$ $1?bust=$RANDOM [L,QSA] + # Rewrite all other requests to index.html + RewriteRule ^(.*)$ /index.html [L] SSLProxyEngine On diff --git a/frontend/package-lock.json b/frontend/package-lock.json index fe90e90537..f39bda174d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "1.0.16", + "version": "1.0.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "frontend", - "version": "1.0.16", + "version": "1.0.20", "dependencies": { "@angular/animations": "^17.3.12", "@angular/cdk": "^17.3.10", @@ -27,7 +27,7 @@ "@ngrx/router-store": "^17.2.0", "@ngrx/store": "^17.2.0", "@nguniversal/express-engine": "^7.0.2", - "@openmina/shared": "^0.108.0", + "@openmina/shared": "^0.116.0", "@sentry/angular": "^8.35.0", "@sentry/cli": "^2.38.2", "@sentry/tracing": "^7.114.0", @@ -6204,9 +6204,9 @@ } }, "node_modules/@openmina/shared": { - "version": "0.108.0", - "resolved": "https://registry.npmjs.org/@openmina/shared/-/shared-0.108.0.tgz", - "integrity": "sha512-vHeP4wO2lfIATOBbO34h9+sigIeWqvioyh/XnBJSDauKEEanjAVof1zbppY/8EhVtEBHLVL2507PV7q8Tnwd2A==", + "version": "0.116.0", + "resolved": "https://registry.npmjs.org/@openmina/shared/-/shared-0.116.0.tgz", + "integrity": "sha512-58wxJEI7T+0vTeBp+X1hn2xq9Y95dm+FiD+z40OuAeIDMpILjnWuhaiMXXdjv/CMfZRC2D42I7OJIwDChmVtvA==", "license": "Apache License, Version 2.0", "dependencies": { "tslib": ">=2.3.0" diff --git a/frontend/package.json b/frontend/package.json index 0aa1340037..269d361c14 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "1.0.20", + "version": "1.0.21", "scripts": { "install:deps": "npm install", "start": "npm install && ng serve --configuration local --open", @@ -42,7 +42,7 @@ "@ngrx/router-store": "^17.2.0", "@ngrx/store": "^17.2.0", "@nguniversal/express-engine": "^7.0.2", - "@openmina/shared": "^0.108.0", + "@openmina/shared": "^0.116.0", "@sentry/angular": "^8.35.0", "@sentry/cli": "^2.38.2", "@sentry/tracing": "^7.114.0", diff --git a/frontend/src/app/app.component.scss b/frontend/src/app/app.component.scss index 994482b668..58810077a6 100644 --- a/frontend/src/app/app.component.scss +++ b/frontend/src/app/app.component.scss @@ -2,7 +2,7 @@ mat-sidenav { width: 160px; - border-right: 1px solid $base-divider; + border-right: none; background-color: $base-background; transition: 200ms ease-out !important; visibility: visible !important; @@ -55,7 +55,7 @@ mat-sidenav-content { color: inherit; background-color: $base-surface; - @media (max-width: 699px) { + @media (max-width: 767px) { background-color: $base-background; } } @@ -63,16 +63,23 @@ mat-sidenav-content { .mina-content { $toolbar: 40px; height: calc(100% - #{$toolbar}); + border-top-left-radius: 6px; + overflow: hidden; + background-color: $base-surface; &.no-toolbar { height: 100%; } &.mobile { - $toolbar: 56px; + $toolbar: 96px; $subMenus: 56px; $tabs: 56px; height: calc(100% - #{$toolbar} - #{$subMenus} - #{$tabs}); + margin-left: 4px; + margin-right: 4px; + margin-bottom: 4px; + border-top-right-radius: 6px; &.no-toolbar { height: calc(100% - #{$subMenus} - #{$tabs}); diff --git a/frontend/src/app/app.effects.ts b/frontend/src/app/app.effects.ts index e5b86fc7e3..fac206adf8 100644 --- a/frontend/src/app/app.effects.ts +++ b/frontend/src/app/app.effects.ts @@ -89,7 +89,6 @@ export class AppEffects extends BaseEffect { filter(() => !this.requestInProgress), tap(() => this.requestInProgress = true), switchMap(() => this.appService.getActiveNodeDetails()), - tap(() => this.requestInProgress = false), map(details => AppActions.getNodeDetailsSuccess({ details })), catchErrorAndRepeat2(MinaErrorType.GENERIC, AppActions.getNodeDetailsSuccess({ details: { @@ -106,6 +105,7 @@ export class AppEffects extends BaseEffect { producingBlockStatus: null, }, })), + tap(() => this.requestInProgress = false), )); } } diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.html b/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.html new file mode 100644 index 0000000000..9b82e4dbad --- /dev/null +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.html @@ -0,0 +1 @@ +{{ epoch }} diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.scss b/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.ts new file mode 100644 index 0000000000..d51a76a631 --- /dev/null +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component.ts @@ -0,0 +1,46 @@ +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { BlockProductionWonSlotsSelectors } from '@block-production/won-slots/block-production-won-slots.state'; +import { filter } from 'rxjs'; +import { BlockProductionWonSlotsSlot } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; +import { BlockProductionWonSlotsEpoch } from '@shared/types/block-production/won-slots/block-production-won-slots-epoch.type'; +import { ONE_BILLION, ONE_THOUSAND } from '@openmina/shared'; +import { getTimeDiff } from '@shared/helpers/date.helper'; + +@Component({ + selector: 'mina-block-production-won-slots-epoch', + templateUrl: './block-production-won-slots-epoch.component.html', + styleUrl: './block-production-won-slots-epoch.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'h-lg pl-12 f-600 fx-row-vert-cent border-bottom' }, +}) +export class BlockProductionWonSlotsEpochComponent extends StoreDispatcher implements OnInit { + epoch: string; + startedAgo: string; + + ngOnInit(): void { + this.listenToEpoch(); + this.listenToEpoch2(); + } + + private listenToEpoch(): void { + this.select(BlockProductionWonSlotsSelectors.slots, (slots: BlockProductionWonSlotsSlot[]) => { + this.epoch = 'Epoch ' + slots[0].epoch; + this.detect(); + }, filter(slots => slots.length > 0)); + } + + private listenToEpoch2(): void { + this.select(BlockProductionWonSlotsSelectors.epoch, (epoch: BlockProductionWonSlotsEpoch) => { + const epochStartTime = this.addMinutesToTimestamp(Math.floor(epoch.currentTime / ONE_BILLION), -(epoch.currentGlobalSlot - epoch.start) * 3); + this.startedAgo = getTimeDiff(Math.floor(epochStartTime * ONE_THOUSAND)).diff; + + this.detect(); + }, filter(Boolean)); + } + + private addMinutesToTimestamp(timestampInSeconds: number, minutesToAdd: number): number { + const secondsToAdd = minutesToAdd * 60; + return timestampInSeconds + secondsToAdd; + } +} diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.html b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.html index 0f2bc3efd6..182a58a2e0 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.html +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.html @@ -8,7 +8,10 @@
- + + @if (isDesktop) { + + }
diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.scss b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.scss index 76009ed69f..c1d2d3ea65 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.scss +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.scss @@ -1,3 +1,14 @@ -mina-block-production-won-slots-cards + div { +@media (max-width: 767px) { + :host ::ng-deep mina-horizontal-resizable-container aside { + right: unset !important; + transition: left .4s cubic-bezier(.22, 1, .36, 1) !important; + &.in-view { + left: 0; + } + + &:not(.in-view) { + left: -100%; + } + } } diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.ts index 666a02d44d..81d78072d0 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.component.ts @@ -16,6 +16,7 @@ import { BlockProductionWonSlotsSelectors } from '@block-production/won-slots/bl export class BlockProductionWonSlotsComponent extends StoreDispatcher implements OnInit, OnDestroy { showSidePanel: boolean = isDesktop(); + isDesktop: boolean = isDesktop(); constructor(protected el: ElementRef) { super(); } diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts index 0cd95a3eab..bbccec2c35 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.effects.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { MinaState, selectMinaState } from '@app/app.setup'; import { Actions, createEffect, ofType } from '@ngrx/effects'; -import { Effect, isDesktop } from '@openmina/shared'; +import { Effect, isDesktop, isMobile } from '@openmina/shared'; import { EMPTY, map, switchMap } from 'rxjs'; import { catchErrorAndRepeat2 } from '@shared/constants/store-functions'; import { MinaErrorType } from '@shared/types/error-preview/mina-error-type.enum'; @@ -9,13 +9,8 @@ import { Store } from '@ngrx/store'; import { BaseEffect } from '@shared/base-classes/mina-rust-base.effect'; import { BlockProductionModule } from '@block-production/block-production.module'; import { BlockProductionWonSlotsService } from '@block-production/won-slots/block-production-won-slots.service'; -import { - BLOCK_PRODUCTION_WON_SLOTS_KEY, - BlockProductionWonSlotsActions, -} from '@block-production/won-slots/block-production-won-slots.actions'; -import { - BlockProductionWonSlotsStatus, -} from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; +import { BLOCK_PRODUCTION_WON_SLOTS_KEY, BlockProductionWonSlotsActions } from '@block-production/won-slots/block-production-won-slots.actions'; +import { BlockProductionWonSlotsStatus } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; import { Router } from '@angular/router'; import { Routes } from '@shared/enums/routes.enum'; import { fromPromise } from 'rxjs/internal/observable/innerFrom'; @@ -51,11 +46,15 @@ export class BlockProductionWonSlotsEffects extends BaseEffect { const bpState = state.blockProduction[BLOCK_PRODUCTION_WON_SLOTS_KEY]; const activeSlotRoute = bpState.activeSlotRoute; let newActiveSlot = slots.find(s => s.globalSlot.toString() === activeSlotRoute); - if (!activeSlotRoute || (activeSlotRoute && !newActiveSlot)) { + if ( + (isDesktop() && !activeSlotRoute) + || (activeSlotRoute && !newActiveSlot) + || (isMobile() && !activeSlotRoute && bpState.slots.length === 0) + ) { newActiveSlot = slots.find(s => s.active) ?? slots.find(s => s.status === BlockProductionWonSlotsStatus.Committed) ?? slots.find(s => s.status === BlockProductionWonSlotsStatus.Scheduled) - ?? null; + ?? slots.find(s => !s.status); } const routes: string[] = [Routes.BLOCK_PRODUCTION, Routes.WON_SLOTS]; if ( diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.module.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.module.ts index df36ef612c..ce1b55df9c 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.module.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.module.ts @@ -20,6 +20,7 @@ import { BlockProductionWonSlotsCardsComponent, } from '@block-production/won-slots/cards/block-production-won-slots-cards.component'; import { SharedModule } from '@shared/shared.module'; +import { BlockProductionWonSlotsEpochComponent } from '@block-production/won-slots/block-production-won-slots-epoch/block-production-won-slots-epoch.component'; @NgModule({ @@ -29,6 +30,7 @@ import { SharedModule } from '@shared/shared.module'; BlockProductionWonSlotsSidePanelComponent, BlockProductionWonSlotsFiltersComponent, BlockProductionWonSlotsCardsComponent, + BlockProductionWonSlotsEpochComponent, ], imports: [ CommonModule, diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts index 63fd852440..d18bc61073 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.reducer.ts @@ -59,8 +59,8 @@ export const blockProductionWonSlotsReducer = createReducer( on(BlockProductionWonSlotsActions.toggleSidePanel, state => ({ ...state, openSidePanel: !state.openSidePanel, - activeSlot: !state.openSidePanel ? state.activeSlot : undefined, - activeSlotRoute: !state.openSidePanel ? state.activeSlotRoute : undefined, + activeSlot: state.openSidePanel ? undefined : state.activeSlot, + activeSlotRoute: state.openSidePanel ? undefined : state.activeSlotRoute, })), on(BlockProductionWonSlotsActions.close, () => initialState), ); diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts index 3fd23cc33b..f99d53354d 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts +++ b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts @@ -5,13 +5,10 @@ import { BlockProductionWonSlotsSlot, BlockProductionWonSlotsStatus, } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; -import { BlockProductionModule } from '@block-production/block-production.module'; -import { hasValue, nanOrElse, ONE_BILLION, ONE_MILLION } from '@openmina/shared'; +import { hasValue, isDesktop, nanOrElse, ONE_BILLION, ONE_MILLION } from '@openmina/shared'; import { getTimeDiff } from '@shared/helpers/date.helper'; import { RustService } from '@core/services/rust.service'; -import { - BlockProductionWonSlotsEpoch, -} from '@shared/types/block-production/won-slots/block-production-won-slots-epoch.type'; +import { BlockProductionWonSlotsEpoch } from '@shared/types/block-production/won-slots/block-production-won-slots-epoch.type'; @Injectable({ providedIn: 'root', @@ -90,7 +87,7 @@ export class BlockProductionWonSlotsService { const futureWonSlots = response.future_won_slots.map((slot: WonSlot) => { slot.slot_time = Math.floor(slot.slot_time / ONE_MILLION); return { - message: 'Upcoming Won Slot', + message: this.getMessage({ won_slot: slot } as Attempt), age: this.calculateTimeAgo({ won_slot: slot }), slotTime: slot.slot_time, globalSlot: slot.global_slot, @@ -120,10 +117,10 @@ export class BlockProductionWonSlotsService { private getMessage(attempt: Attempt): string { if (attempt.active) { - return 'Produced'; + return 'Producing'; } if (attempt.status === BlockProductionWonSlotsStatus.Scheduled) { - return 'Production Scheduled'; + return (isDesktop() ? 'Production ' : '') + 'Scheduled'; } else if (attempt.status === BlockProductionWonSlotsStatus.Canonical) { return 'Produced Block'; } else if (attempt.status === BlockProductionWonSlotsStatus.Orphaned) { @@ -131,9 +128,9 @@ export class BlockProductionWonSlotsService { } else if (attempt.status === BlockProductionWonSlotsStatus.Discarded) { return BlockProductionWonSlotsStatus.Discarded + ' Block'; } else if (attempt.status === BlockProductionWonSlotsStatus.Committed) { - return 'Waiting for Confirmation'; + return isDesktop() ? 'Waiting for Confirmation' : 'Confirming'; } - return 'Upcoming Won Slot'; + return (isDesktop() ? 'Upcoming ' : '') + 'Won Slot'; } private calculateTimeAgo({ active, won_slot }: { active?: boolean; won_slot: WonSlot }): string { diff --git a/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.html b/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.html index 37d961d2b3..0e8049dc34 100644 --- a/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.html +++ b/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.html @@ -2,37 +2,30 @@
- { - const epochStartTime = this.addMinutesToTimestamp(Math.floor(epoch.currentTime / ONE_BILLION), -(epoch.currentGlobalSlot - epoch.start) * 3); - this.card1.startedAgo = getTimeDiff(Math.floor(epochStartTime * ONE_THOUSAND)).diff; - const epochEndTime = this.addMinutesToTimestamp(epoch.currentTime / ONE_BILLION, (epoch.end - epoch.currentGlobalSlot) * 3); - this.card5.endIn = getTimeDiff(epochEndTime * ONE_THOUSAND).diff; - this.card5.epochProgress = Math.floor((epoch.currentGlobalSlot - epoch.start) / (epoch.end - epoch.start) * 100) + '%'; + this.card4.endIn = getTimeDiff(epochEndTime * ONE_THOUSAND).diff; + this.card4.epochProgress = Math.floor((epoch.currentGlobalSlot - epoch.start) / (epoch.end - epoch.start) * 100) + '%'; this.detect(); }, filter(Boolean)); @@ -49,29 +45,28 @@ export class BlockProductionWonSlotsCardsComponent extends StoreDispatcher imple private listenToSlots(): void { this.select(BlockProductionWonSlotsSelectors.slots, (slots: BlockProductionWonSlotsSlot[]) => { - this.card1.epoch = slots[0].epoch; const nextSlot = slots.find(s => s.status === BlockProductionWonSlotsStatus.Scheduled || !s.status); if (nextSlot) { - this.card2.nextWonSlot = getTimeDiff(nextSlot.slotTime).diff; - this.card2.slot = nextSlot.globalSlot; + this.card1.nextWonSlot = getTimeDiff(nextSlot.slotTime).diff; + this.card1.slot = nextSlot.globalSlot; } else { - this.card2.nextWonSlot = 'Now'; - this.card2.slot = slots.find(s => s.active)?.globalSlot; + this.card1.nextWonSlot = 'Now'; + this.card1.slot = slots.find(s => s.active)?.globalSlot; } - this.card3.wonSlots = slots.length; - this.card3.slotsUsed = slots.filter( + this.card2.wonSlots = slots.length; + this.card2.slotsUsed = slots.filter( s => [BlockProductionWonSlotsStatus.Canonical, BlockProductionWonSlotsStatus.Orphaned, BlockProductionWonSlotsStatus.Discarded].includes(s.status), ).length; - this.card4.acceptedBlocks = slots.filter(s => s.status === BlockProductionWonSlotsStatus.Canonical).length; - this.card4.lastBlockTime = getTimeDiff(lastItem(slots.filter(s => s.status === BlockProductionWonSlotsStatus.Canonical))?.slotTime).diff; + this.card3.acceptedBlocks = slots.filter(s => s.status === BlockProductionWonSlotsStatus.Canonical).length; + this.card3.lastBlockTime = getTimeDiff(lastItem(slots.filter(s => s.status === BlockProductionWonSlotsStatus.Canonical))?.slotTime).diff; - this.card6.totalRewards = slots + this.card5.totalRewards = slots .filter(s => [BlockProductionWonSlotsStatus.Canonical].includes(s.status)) .map(s => s.coinbaseRewards + s.txFeesRewards).reduce((a, b) => a + b, 0).toFixed(0); - this.card6.totalRewards = isNaN(+this.card6.totalRewards) ? '0' : this.card6.totalRewards; + this.card5.totalRewards = isNaN(+this.card5.totalRewards) ? '0' : this.card5.totalRewards; this.detect(); }, filter(slots => slots.length > 0)); } diff --git a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.html b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.html index 4c48efdc23..dc6ca90815 100644 --- a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.html +++ b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.html @@ -1,13 +1,19 @@ -
- {{ title }} +
+
+ @if (isMobile) { +
+
+ arrow_back +
+
+ } + {{ title }} +
@if (percentage !== null && percentage !== undefined) {
{{ percentage }}%
} - @if (isMobile) { - close - }
@@ -15,7 +21,7 @@
-
+
Global slot diff --git a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.scss b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.scss index d2b6dceb15..bb189a824f 100644 --- a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.scss +++ b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.scss @@ -1,10 +1,23 @@ @import 'openmina'; +$blue: #57d7ff; +$pink: #fda2ff; +$orange: #ff833d; + +:host { + //linear-gradient(64deg, rgba(87, 215, 255, 0.15) 10%, rgba(253, 162, 255, 0.15) 60%, rgba(255, 131, 61, 0.15) 82%) + background: linear-gradient(70deg, rgba($blue, .15) 5%, rgba($pink, .15) 45%, rgba($orange, .15) 90%); +} + +.top { + border-bottom: 2px solid transparent; +} + .progress-bar { overflow: hidden; height: 6px; left: 0; - bottom: 0; + bottom: -3px; transition: width 0.4s ease-in-out; min-width: 20px; diff --git a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts index de74fe2848..486440ef00 100644 --- a/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts +++ b/frontend/src/app/features/block-production/won-slots/side-panel/block-production-won-slots-side-panel.component.ts @@ -7,7 +7,7 @@ import { BlockProductionWonSlotTimes, } from '@shared/types/block-production/won-slots/block-production-won-slots-slot.type'; import { getTimeDiff } from '@shared/helpers/date.helper'; -import { any, hasValue, isMobile, noMillisFormat, ONE_THOUSAND, safelyExecuteInBrowser, SecDurationConfig, toReadableDate } from '@openmina/shared'; +import { any, hasValue, isDesktop, isMobile, noMillisFormat, ONE_THOUSAND, safelyExecuteInBrowser, SecDurationConfig, toReadableDate } from '@openmina/shared'; import { filter } from 'rxjs'; import { BlockProductionWonSlotsActions } from '@block-production/won-slots/block-production-won-slots.actions'; import { AppSelectors } from '@app/app.state'; @@ -20,6 +20,7 @@ import { Routes } from '@shared/enums/routes.enum'; templateUrl: './block-production-won-slots-side-panel.component.html', styleUrls: ['./block-production-won-slots-side-panel.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'flex-column h-100' }, }) export class BlockProductionWonSlotsSidePanelComponent extends StoreDispatcher implements OnInit, OnDestroy { @@ -194,4 +195,5 @@ export class BlockProductionWonSlotsSidePanelComponent extends StoreDispatcher i super.ngOnDestroy(); clearInterval(this.timer); } + } diff --git a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html index 3e42122963..1c4d6d44ca 100644 --- a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html +++ b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html @@ -6,7 +6,7 @@ *ngIf="row.active || row.status === BlockProductionWonSlotsStatus.Committed; else icon"> schedule + class="schedule mina-icon icon-200 f-20">schedule circle diff --git a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.scss b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.scss index 25d6f79317..f8fc4575fc 100644 --- a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.scss +++ b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.scss @@ -1,5 +1,9 @@ @import 'openmina'; +$blue: #57d7ff; +$pink: #fda2ff; +$orange: #ff833d; + .mina-icon.f-big { font-variation-settings: 'FILL' 1, 'wght' 400 !important; } @@ -36,6 +40,21 @@ border-color: $selected-primary !important; border-top-color: transparent !important; } + + .schedule, + .Scheduled, + .Producing { + background: linear-gradient(5deg, $blue 30%, $pink 55%, $orange 100%); + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; + } + + .schedule { + @media (max-width: 767px) { + font-size: 16px !important; + } + } } .fx-row-vert-cent { diff --git a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts index 0334986ccb..4f23b56c9c 100644 --- a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts +++ b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { MinaTableRustWrapper } from '@shared/base-classes/mina-table-rust-wrapper.class'; -import { getMergedRoute, MergedRoute, SecDurationConfig, TableColumnList } from '@openmina/shared'; +import { getMergedRoute, isDesktop, MergedRoute, SecDurationConfig, TableColumnList } from '@openmina/shared'; import { Router } from '@angular/router'; import { SnarksWorkPoolToggleSidePanel } from '@snarks/work-pool/snarks-work-pool.actions'; import { filter, take } from 'rxjs'; @@ -57,7 +57,7 @@ export class BlockProductionWonSlotsTableComponent extends MinaTableRustWrapper< } protected override setupTable(): void { - this.table.gridTemplateColumns = [210, 140, 90, 140, 120, 120, 120, 120, 150, 150]; + this.table.gridTemplateColumns = isDesktop() ? [210, 140, 90, 142, 120, 120, 120, 124, 159, 150] : [150, 100, 90, 130, 100, 105, 100, 114, 139, 130]; this.table.propertyForActiveCheck = 'globalSlot'; this.table.thGroupsTemplate = this.thGroupsTemplate; this.table.sortAction = BlockProductionWonSlotsActions.sort; @@ -96,7 +96,7 @@ export class BlockProductionWonSlotsTableComponent extends MinaTableRustWrapper< this.table.activeRow = slot; this.table.detect(); this.detect(); - }, filter(Boolean)); + }); } private scrollToElement(): void { @@ -107,11 +107,11 @@ export class BlockProductionWonSlotsTableComponent extends MinaTableRustWrapper< this.onRowClick(this.table.rows[i]); } - protected override onRowClick(slot: BlockProductionWonSlotsSlot): void { + protected override onRowClick(slot: BlockProductionWonSlotsSlot, isRealClick?: boolean): void { if (!slot) { return; } - if (this.table.activeRow?.globalSlot !== slot?.globalSlot) { + if (this.table.activeRow?.globalSlot !== slot?.globalSlot || isRealClick) { this.dispatch2(BlockProductionWonSlotsActions.setActiveSlot({ slot })); this.router.navigate([Routes.BLOCK_PRODUCTION, Routes.WON_SLOTS, slot.globalSlot], { queryParamsHandling: 'merge' }); } diff --git a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html index 46037f53df..b8ec53bcfe 100644 --- a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html +++ b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html @@ -1,38 +1,46 @@ -
-
-
Last 290 blocks
-
{{ syncProgress }}
-
-
-
+
+
+
+ @if (appliedPercentage === 100) { + check_circle + } @else { + + } +
Last 290 blocks
+
{{ syncProgress }}
-
+
- + @if (isDesktop) { + + } - + @if (isDesktop) { + + }
diff --git a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.scss b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.scss index 51d9324e02..c5bb8daa6e 100644 --- a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.scss +++ b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.scss @@ -1,42 +1,9 @@ -@import 'openmina'; - -.progress-bar { - overflow: hidden; - height: 6px; - left: 0; - bottom: 0; - transition: width 0.6s ease-in-out; - min-width: 20px; - - .highlight { - height: 4px; - top: 1px; - left: -50px; - width: 50px; - background: radial-gradient($success-primary, $success-primary, $success-primary, $success-primary, transparent, transparent); - border-radius: 20px; - animation: move 9s linear infinite; - } - - .progress { - height: 2px; - background-color: $success-primary; - top: 2px; - left: 0; - } +.mina-icon { + font-variation-settings: 'FILL' 1, 'wght' 300 !important; } -@keyframes move { - 0% { - left: -50px; - } - 10% { - left: -50px; - } - 80% { - left: 100%; - } - 100% { - left: 100%; +@media (max-width: 767px) { + .mobile mina-card { + width: 33%; } } diff --git a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts index bd29e3cb04..4caaf5090d 100644 --- a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts +++ b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts @@ -2,9 +2,8 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { selectDashboardNodesAndPeers } from '@dashboard/dashboard.state'; import { NodesOverviewNode } from '@shared/types/nodes/dashboard/nodes-overview-node.type'; -import { filter } from 'rxjs'; import { NodesOverviewNodeBlockStatus } from '@shared/types/nodes/dashboard/nodes-overview-block.type'; -import { lastItem, ONE_MILLION } from '@openmina/shared'; +import { isDesktop, lastItem, ONE_MILLION } from '@openmina/shared'; import { DashboardPeer } from '@shared/types/dashboard/dashboard.peer'; const PENDING = 'Pending'; @@ -28,6 +27,7 @@ export class DashboardBlocksSyncComponent extends StoreDispatcher implements OnI bestTipBlockSyncedText: string = PENDING; targetBlock: number; syncProgress: string; + isDesktop: boolean = isDesktop(); ngOnInit(): void { this.listenToNodesChanges(); diff --git a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html index def4089c6b..193765b65f 100644 --- a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html +++ b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html @@ -1,12 +1,14 @@ -
-
-
Ledgers
-
{{ progress }}
-
-
-
+
+
+
+ @if (totalProgress === 100) { + check_circle + } @else { + + } +
Ledgers
+
{{ progress }}
- - Network -
-
-
-
Peers
-
-
-
-
+
+
+ @if (stats.connected) { + check_circle + } @else { + + } +
Peers
-
+
-
+
- - - account_tree - - - - diff --git a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss index 818da2c61d..6e1afba0ea 100644 --- a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss +++ b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss @@ -1,60 +1,3 @@ -@import 'openmina'; - -:host { - max-width: 384px; -} - -.loading-icon { - animation: spin 2s linear infinite; -} - -@keyframes spin { - 0% { - transform: rotate(0); - } - 100% { - transform: rotate(360deg); - } -} - - -.progress-bar { - overflow: hidden; - height: 6px; - left: 0; - bottom: 0; - transition: width 0.6s ease-in-out; - min-width: 20px; - - .highlight { - height: 4px; - top: 1px; - left: -50px; - width: 50px; - background: radial-gradient($success-primary, $success-primary, $success-primary, $success-primary, transparent, transparent); - border-radius: 20px; - animation: move 9s linear infinite; - } - - .progress { - height: 2px; - background-color: $success-primary; - top: 2px; - left: 0; - } -} - -@keyframes move { - 0% { - left: -50px; - } - 10% { - left: -50px; - } - 80% { - left: 100%; - } - 100% { - left: 100%; - } +.mina-icon { + font-variation-settings: 'FILL' 1, 'wght' 300 !important; } diff --git a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts index 3c8b63e204..ff47a7e17f 100644 --- a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts +++ b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts @@ -3,7 +3,6 @@ import { DashboardPeersStats } from '@shared/types/dashboard/dashboard-peers-sta import { selectDashboardPeersStats } from '@dashboard/dashboard.state'; import { skip } from 'rxjs'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; -import { NodesOverviewLedgerStepState } from '@shared/types/nodes/dashboard/nodes-overview-ledger.type'; @Component({ selector: 'mina-dashboard-network', diff --git a/frontend/src/app/features/dashboard/dashboard-peers-minimal-table/dashboard-peers-minimal-table.component.scss b/frontend/src/app/features/dashboard/dashboard-peers-minimal-table/dashboard-peers-minimal-table.component.scss index bb3787a918..53e4ca2058 100644 --- a/frontend/src/app/features/dashboard/dashboard-peers-minimal-table/dashboard-peers-minimal-table.component.scss +++ b/frontend/src/app/features/dashboard/dashboard-peers-minimal-table/dashboard-peers-minimal-table.component.scss @@ -14,6 +14,7 @@ :host ::ng-deep cdk-virtual-scroll-viewport { overflow-y: auto !important; + border-bottom: none !important; } .fx-row-vert-cent { diff --git a/frontend/src/app/features/dashboard/dashboard.component.html b/frontend/src/app/features/dashboard/dashboard.component.html index 97e54aa457..7e2a718d84 100644 --- a/frontend/src/app/features/dashboard/dashboard.component.html +++ b/frontend/src/app/features/dashboard/dashboard.component.html @@ -1,4 +1,18 @@ -
+
+
+ @if (connectedProgress + ledgerProgress + blockSyncProgress < 100) { +
+ } +
+
+
+ {{ updateAction }}{{ updateDetail }} +
+
+
- + +
diff --git a/frontend/src/app/features/dashboard/dashboard.component.scss b/frontend/src/app/features/dashboard/dashboard.component.scss index cd151fd9f7..ceee98e524 100644 --- a/frontend/src/app/features/dashboard/dashboard.component.scss +++ b/frontend/src/app/features/dashboard/dashboard.component.scss @@ -4,6 +4,93 @@ background-color: $base-background; } -div { +.comps { gap: 8px; + padding-right: 8px; + + @media (max-width: 767px) { + padding: 0 8px; + } +} + +mina-dashboard-network { + max-width: 384px; +} + +mina-dashboard-ledger { + width: 100%; + max-width: 384px; + min-width: 250px; +} + +mina-dashboard-blocks-sync { + width: 100%; + max-width: 640px; +} + +@media (max-width: 767px) { + mina-dashboard-network, + mina-dashboard-ledger, + mina-dashboard-blocks-sync { + max-width: 100%; + } +} + +.header { + transition: height .6s ease-in, opacity .4s .4s ease-in; + + &.hide { + height: 0 !important; + opacity: 0; + } + + @media (max-width: 767px) { + &.hide { + height: 8px !important; + } + .primary { + padding-left: 8px; + } + } +} + +.progress-bar { + overflow: hidden; + height: 4px; + left: 0; + top: -2px; + transition: width 0.6s ease-in-out; + min-width: 20px; + + .highlight { + height: 4px; + top: 1px; + left: -50px; + width: 50px; + background: radial-gradient($success-primary, $success-primary, $success-primary, $success-primary, transparent, transparent); + border-radius: 20px; + animation: move 9s linear infinite; + } + + .progress { + height: 2px; + background-color: $success-primary; + top: 2px; + left: 0; + } +} + +@keyframes move { + 0% { + left: -50px; + } + 10% { + left: -50px; + } + 80% { + left: 100%; + } + 100% { + left: 100%; + } } diff --git a/frontend/src/app/features/dashboard/dashboard.component.ts b/frontend/src/app/features/dashboard/dashboard.component.ts index cc2dbaaf7e..bcb8fc4605 100644 --- a/frontend/src/app/features/dashboard/dashboard.component.ts +++ b/frontend/src/app/features/dashboard/dashboard.component.ts @@ -4,18 +4,43 @@ import { DashboardGetData, DashboardInit } from '@dashboard/dashboard.actions'; import { filter, skip, tap, timer } from 'rxjs'; import { untilDestroyed } from '@ngneat/until-destroy'; import { AppSelectors } from '@app/app.state'; +import { selectDashboardNodesAndPeers, selectDashboardNodesAndRpcStats, selectDashboardPeersStats } from '@dashboard/dashboard.state'; +import { DashboardPeersStats } from '@shared/types/dashboard/dashboard-peers-stats.type'; +import { NodesOverviewNode } from '@shared/types/nodes/dashboard/nodes-overview-node.type'; +import { DashboardRpcStats } from '@shared/types/dashboard/dashboard-rpc-stats.type'; +import { NodesOverviewLedgerStepState } from '@shared/types/nodes/dashboard/nodes-overview-ledger.type'; +import { lastItem, ONE_MILLION, SecDurationConfig } from '@openmina/shared'; +import { DashboardPeer } from '@shared/types/dashboard/dashboard.peer'; +import { NodesOverviewNodeBlockStatus } from '@shared/types/nodes/dashboard/nodes-overview-block.type'; @Component({ selector: 'mina-dashboard', templateUrl: './dashboard.component.html', styleUrls: ['./dashboard.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - host: { class: 'h-100 w-100 flex-row' }, + host: { class: 'h-100 w-100 flex-column' }, }) export class DashboardComponent extends StoreDispatcher implements OnInit { + updateAction: string; + updateDetail: string; + connectedProgress: number = 0; + ledgerProgress: number = 0; + blockSyncProgress: number = 0; + + private connected: boolean = false; + ngOnInit(): void { + this.updateAction = 'Connecting to peers'; + this.listenToNodeChanging(); + this.listenToPeersChanges(); + this.getDashboardData(); + this.listenToNodesChanges(); + this.listenToNodesChanges(); + } + + private getDashboardData(): void { this.dispatch(DashboardInit); timer(4000, 4000) .pipe( @@ -28,6 +53,85 @@ export class DashboardComponent extends StoreDispatcher implements OnInit { private listenToNodeChanging(): void { this.select(AppSelectors.activeNode, () => { this.dispatch(DashboardGetData, { force: true }); - }, filter(Boolean), skip(1), untilDestroyed(this)); + }, filter(Boolean), skip(1)); + } + + private listenToPeersChanges(): void { + this.select(selectDashboardPeersStats, (stats: DashboardPeersStats) => { + if (this.connected && stats.connected === 0 || !this.connected) { + if (stats.connected > 0) { + this.updateAction = `Connected to ${stats.connected} peer${stats.connected !== 1 ? 's' : ''}`; + } else if (stats.connecting > 0) { + this.updateAction = `Connecting to ${stats.connecting} peer${stats.connecting !== 1 ? 's' : ''}`; + } else { + this.updateAction = 'Looking for peers'; + } + if (stats.connected) { + this.connectedProgress = 33; + } else { + this.connectedProgress = 0; + this.ledgerProgress = 0; + this.blockSyncProgress = 0; + } + this.detect(); + } + this.connected = stats.connected > 0; + }, skip(1)); + } + + private listenToNodesChanges(): void { + this.select(selectDashboardNodesAndRpcStats, ([nodes, rpcStats]: [NodesOverviewNode[], DashboardRpcStats]) => { + if (nodes.length !== 0) { + const ledgers = nodes[0].ledgers; + + let stakingProgress = rpcStats.stakingLedger?.fetched / rpcStats.stakingLedger?.estimation * 100 || 0; + let nextProgress = rpcStats.nextLedger?.fetched / rpcStats.nextLedger?.estimation * 100 || 0; + let rootSnarkedProgress = rpcStats.rootLedger?.fetched / rpcStats.rootLedger?.estimation * 100 || 0; + let rootStagedProgress = ledgers.rootStaged.staged.fetchPartsEnd ? 50 : 0; + + if (ledgers.stakingEpoch.state === NodesOverviewLedgerStepState.SUCCESS) { + stakingProgress = 100; + this.updateAction = 'Downloading Next Epoch Ledger'; + } + if (ledgers.nextEpoch.state === NodesOverviewLedgerStepState.SUCCESS) { + nextProgress = 100; + this.updateAction = 'Downloading Root Snarked Ledger'; + } + if (ledgers.rootSnarked.state === NodesOverviewLedgerStepState.SUCCESS) { + rootSnarkedProgress = 100; + this.updateAction = 'Downloading Root Staged Ledger'; + } + if (ledgers.rootStaged.state === NodesOverviewLedgerStepState.SUCCESS) { + rootStagedProgress = 100; + this.updateAction = 'Fetching Blocks'; + } + const ledgerProgressTotal = (stakingProgress + nextProgress + rootSnarkedProgress + rootStagedProgress) / 4; + this.ledgerProgress = ledgerProgressTotal * 0.33; + + let blocks = nodes[0].blocks; + + blocks = blocks.slice(1); + + const fetched = blocks.filter(b => ![NodesOverviewNodeBlockStatus.MISSING, NodesOverviewNodeBlockStatus.FETCHING].includes(b.status)).length; + const fetchedPercentage = Math.round(fetched * 100 / 291); + + const applied = blocks.filter(b => b.status === NodesOverviewNodeBlockStatus.APPLIED).length; + const appliedPercentage = Math.round(applied * 100 / 291); + this.blockSyncProgress = appliedPercentage * 0.34; + + if (fetchedPercentage < 100) { + this.updateAction = `Fetching Blocks (${fetchedPercentage}%)`; + } else if (appliedPercentage < 100) { + this.updateAction = `Applying Blocks (${appliedPercentage}%)`; + } else { + this.updateAction = ''; + } + + } else { + this.ledgerProgress = 0; + this.blockSyncProgress = 0; + } + this.detect(); + }); } } diff --git a/frontend/src/app/features/dashboard/mina-card/mina-card.component.html b/frontend/src/app/features/dashboard/mina-card/mina-card.component.html deleted file mode 100644 index a83c6194b1..0000000000 --- a/frontend/src/app/features/dashboard/mina-card/mina-card.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
- {{ label }} - {{ icon }} -
-
{{ value ?? '-' }}
-
{{ hint }}
diff --git a/frontend/src/app/features/dashboard/mina-card/mina-card.component.scss b/frontend/src/app/features/dashboard/mina-card/mina-card.component.scss deleted file mode 100644 index a5a87f8b45..0000000000 --- a/frontend/src/app/features/dashboard/mina-card/mina-card.component.scss +++ /dev/null @@ -1,18 +0,0 @@ -:host { - height: 128px; - width: 128px; - - @media (max-width: 700px) { - height: 140px; - width: 140px; - } -} - -.mina-icon { - margin-left: 3px; -} - -.value { - font-size: 24px; - letter-spacing: 0.15px; -} diff --git a/frontend/src/app/features/dashboard/mina-card/mina-card.component.ts b/frontend/src/app/features/dashboard/mina-card/mina-card.component.ts deleted file mode 100644 index 9681cbd29a..0000000000 --- a/frontend/src/app/features/dashboard/mina-card/mina-card.component.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; - -@Component({ - selector: 'mina-card', - templateUrl: './mina-card.component.html', - styleUrls: ['./mina-card.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - host: { class: 'flex-column flex-between pt-8 pb-8 pl-12 border-rad-8 bg-surface' }, -}) -export class MinaCardComponent { - - @Input() color: string = 'var(--base-primary)'; - @Input() labelColor: string = 'var(--base-primary)'; - @Input() hintColor: string = 'var(--base-tertiary)'; - @Input() icon: string; - @Input() label: string | number; - @Input() value: string | number; - @Input() hint: string | number; - @Input() tooltipText: string; - -} diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html index 2bfabe225f..5fac9c6f20 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.html @@ -12,7 +12,8 @@
{{ loadingMessage || downloadingMessage }}
+ [@messageChange]="loadingMessage">{{ loadingMessage || downloadingMessage }} +
@@ -35,21 +36,6 @@
- - - - - - - - - - - - - - -
diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.scss b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.scss index 5a94cfb8f7..d81a6a14e8 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.scss +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.scss @@ -52,10 +52,6 @@ $white: #000000; } } -.errors { - max-width: 568px; -} - .footer { height: 72px; max-width: 568px; diff --git a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts index 1c526a6950..2c563d5c13 100644 --- a/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts +++ b/frontend/src/app/features/webnode/web-node-initialization/web-node-initialization.component.ts @@ -5,7 +5,7 @@ import { WebNodeService } from '@core/services/web-node.service'; import { any, GlobalErrorHandlerService, safelyExecuteInBrowser } from '@openmina/shared'; import { NgClass, NgForOf, NgIf, NgOptimizedImage } from '@angular/common'; import { Router } from '@angular/router'; -import { getFirstFeature } from '@shared/constants/config'; +import { CONFIG, getFirstFeature } from '@shared/constants/config'; import { animate, style, transition, trigger } from '@angular/animations'; import { filter, switchMap, timer } from 'rxjs'; import { LoadingSpinnerComponent } from '@shared/loading-spinner/loading-spinner.component'; @@ -76,6 +76,10 @@ export class WebNodeInitializationComponent extends StoreDispatcher implements O private router: Router) { super(); } ngOnInit(): void { + if (!this.webNodeService.hasWebNodeConfig()) { + this.router.navigate([getFirstFeature()]); + return; + } safelyExecuteInBrowser(() => { window.dispatchEvent(new CustomEvent('startWebNode')); }); diff --git a/frontend/src/app/layout/block-production-pill/block-production-pill.component.scss b/frontend/src/app/layout/block-production-pill/block-production-pill.component.scss index e6cb62f294..681038696f 100644 --- a/frontend/src/app/layout/block-production-pill/block-production-pill.component.scss +++ b/frontend/src/app/layout/block-production-pill/block-production-pill.component.scss @@ -11,10 +11,11 @@ $orange: #ff833d; :host { position: relative; - min-width: 170px; - height: 26px; + min-width: 178px; + height: 34px; @media (min-width: 768px) { margin-right: 8px; + height: 26px; } } @@ -89,18 +90,18 @@ $orange: #ff833d; height: 80px; width: 80px; position: absolute; - animation: rotate 8s infinite linear; + animation: rotate 5s infinite linear; } @media (min-width: 768px) { @keyframes rotate { /* From left bottom to right bottom */ 0% { - left: -21%; + left: -10%; transform: rotate(-45deg); } 5% { - left: -21%; + left: -10%; transform: rotate(-185deg); } /* Turn around */ @@ -115,12 +116,18 @@ $orange: #ff833d; 55% { left: 65%; } - /* No turn around. -405 = -45 visually */ 62% { - transform: rotate(-405deg); + transform: rotate(-420deg); } + 80% { + transform: rotate(-420deg); + } + 95% { + left: 0; + } + /* No turn around. -405 = -45 visually */ 100% { - left: -21%; + left: -10%; transform: rotate(-405deg); } } diff --git a/frontend/src/app/layout/menu-tabs/menu-tabs.component.ts b/frontend/src/app/layout/menu-tabs/menu-tabs.component.ts index b0a02004cc..e5005f6a50 100644 --- a/frontend/src/app/layout/menu-tabs/menu-tabs.component.ts +++ b/frontend/src/app/layout/menu-tabs/menu-tabs.component.ts @@ -1,9 +1,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { getMergedRoute, HorizontalMenuComponent, ManualDetection, MergedRoute, removeParamsFromURL } from '@openmina/shared'; +import { getMergedRoute, HorizontalMenuComponent, MergedRoute, removeParamsFromURL } from '@openmina/shared'; import { getAvailableFeatures } from '@shared/constants/config'; import { MENU_ITEMS, MenuItem } from '@app/layout/menu/menu.component'; -import { Store } from '@ngrx/store'; -import { MinaState } from '@app/app.setup'; import { filter, map, tap } from 'rxjs'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { MinaNode } from '@shared/types/core/environment/mina-env.type'; diff --git a/frontend/src/app/layout/menu/menu.component.scss b/frontend/src/app/layout/menu/menu.component.scss index 57a0ef3e7d..81b7ae7000 100644 --- a/frontend/src/app/layout/menu/menu.component.scss +++ b/frontend/src/app/layout/menu/menu.component.scss @@ -5,7 +5,6 @@ padding: 8px 12px; border: none; border-radius: 0; - border-bottom: 1px solid $base-divider; background-color: unset; transition: width 200ms ease-out, background-color 80ms; diff --git a/frontend/src/app/layout/server-status/server-status.component.html b/frontend/src/app/layout/server-status/server-status.component.html index 8ccba7ebac..e520b9fe26 100644 --- a/frontend/src/app/layout/server-status/server-status.component.html +++ b/frontend/src/app/layout/server-status/server-status.component.html @@ -39,15 +39,15 @@ {{ blockTimeAgo ? blockTimeAgo + ' ago' : '' }}
- @if (!isMobile) { -
-
diff --git a/frontend/src/app/layout/server-status/server-status.component.scss b/frontend/src/app/layout/server-status/server-status.component.scss index 5230d13696..ce0fe36beb 100644 --- a/frontend/src/app/layout/server-status/server-status.component.scss +++ b/frontend/src/app/layout/server-status/server-status.component.scss @@ -107,7 +107,7 @@ width: 100%; &.h-sm, .h-sm { - height: 24px !important; + height: 32px !important; } } } diff --git a/frontend/src/app/layout/server-status/server-status.component.ts b/frontend/src/app/layout/server-status/server-status.component.ts index 7ba694d134..4f459b9705 100644 --- a/frontend/src/app/layout/server-status/server-status.component.ts +++ b/frontend/src/app/layout/server-status/server-status.component.ts @@ -62,8 +62,7 @@ export class ServerStatusComponent extends StoreDispatcher implements OnInit { protected readonly AppNodeStatus = AppNodeStatus; protected readonly canAddNodes = CONFIG.canAddNodes; - @Input() switchForbidden: boolean; - + switchForbidden: boolean; isMobile: boolean; activeNode: MinaNode; details: AppNodeDetails; diff --git a/frontend/src/app/layout/toolbar/loading.reducer.ts b/frontend/src/app/layout/toolbar/loading.reducer.ts index 8f9666026f..6fcb7d8253 100644 --- a/frontend/src/app/layout/toolbar/loading.reducer.ts +++ b/frontend/src/app/layout/toolbar/loading.reducer.ts @@ -8,16 +8,8 @@ import { STATE_ACTIONS_GET_EARLIEST_SLOT, STATE_ACTIONS_GET_EARLIEST_SLOT_SUCCESS, } from '@state/actions/state-actions.actions'; -import { - NODES_OVERVIEW_CLOSE, - NODES_OVERVIEW_GET_NODES_SUCCESS, - NODES_OVERVIEW_INIT, -} from '@nodes/overview/nodes-overview.actions'; -import { - NODES_BOOTSTRAP_CLOSE, - NODES_BOOTSTRAP_GET_NODES_SUCCESS, - NODES_BOOTSTRAP_INIT, -} from '@nodes/bootstrap/nodes-bootstrap.actions'; +import { NODES_OVERVIEW_CLOSE, NODES_OVERVIEW_GET_NODES_SUCCESS, NODES_OVERVIEW_INIT } from '@nodes/overview/nodes-overview.actions'; +import { NODES_BOOTSTRAP_CLOSE, NODES_BOOTSTRAP_GET_NODES_SUCCESS, NODES_BOOTSTRAP_INIT } from '@nodes/bootstrap/nodes-bootstrap.actions'; import { NODES_LIVE_CLOSE, NODES_LIVE_GET_NODES_SUCCESS, NODES_LIVE_INIT } from '@nodes/live/nodes-live.actions'; import { SNARKS_WORK_POOL_CLOSE, @@ -27,17 +19,8 @@ import { SNARKS_WORK_POOL_INIT, } from '@snarks/work-pool/snarks-work-pool.actions'; import { SCAN_STATE_CLOSE, SCAN_STATE_GET_BLOCK_SUCCESS, SCAN_STATE_INIT } from '@snarks/scan-state/scan-state.actions'; -import { DASHBOARD_CLOSE, DASHBOARD_GET_DATA_SUCCESS, DASHBOARD_INIT } from '@dashboard/dashboard.actions'; -import { - MEMORY_RESOURCES_CLOSE, - MEMORY_RESOURCES_GET, - MEMORY_RESOURCES_GET_SUCCESS, -} from '@resources/memory/memory-resources.actions'; -import { - NETWORK_NODE_DHT_CLOSE, - NETWORK_NODE_DHT_GET_PEERS_SUCCESS, - NETWORK_NODE_DHT_INIT, -} from '@network/node-dht/network-node-dht.actions'; +import { MEMORY_RESOURCES_CLOSE, MEMORY_RESOURCES_GET, MEMORY_RESOURCES_GET_SUCCESS } from '@resources/memory/memory-resources.actions'; +import { NETWORK_NODE_DHT_CLOSE, NETWORK_NODE_DHT_GET_PEERS_SUCCESS, NETWORK_NODE_DHT_INIT } from '@network/node-dht/network-node-dht.actions'; import { NETWORK_BOOTSTRAP_STATS_CLOSE, NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS_SUCCESS, @@ -48,7 +31,8 @@ import { BENCHMARKS_WALLETS_CLOSE, BENCHMARKS_WALLETS_GET_ALL_TXS, BENCHMARKS_WALLETS_GET_ALL_TXS_SUCCESS, - BENCHMARKS_WALLETS_GET_WALLETS, BENCHMARKS_WALLETS_GET_WALLETS_SUCCESS, + BENCHMARKS_WALLETS_GET_WALLETS, + BENCHMARKS_WALLETS_GET_WALLETS_SUCCESS, } from '@benchmarks/wallets/benchmarks-wallets.actions'; export type LoadingState = string[]; @@ -60,8 +44,6 @@ export function loadingReducer(state: LoadingState = initialState, action: Featu /* ------------ ADD ------------ */ case `[${APP_PREFIX}] Init`: - case DASHBOARD_INIT: - case `[${BLOCK_PRODUCTION_PREFIX} Overview] Get Slots`: case `[${BLOCK_PRODUCTION_PREFIX} Won Slots] Init`: @@ -90,11 +72,6 @@ export function loadingReducer(state: LoadingState = initialState, action: Featu case `[${APP_PREFIX}] Init Success`: return remove(state, `[${APP_PREFIX}] Init`); - case DASHBOARD_GET_DATA_SUCCESS: - return remove(state, DASHBOARD_INIT); - case DASHBOARD_CLOSE: - return remove(state, [DASHBOARD_INIT]); - case `[${BLOCK_PRODUCTION_PREFIX} Overview] Get Slots Success`: return remove(state, `[${BLOCK_PRODUCTION_PREFIX} Overview] Get Slots`); case `[${BLOCK_PRODUCTION_PREFIX} Overview] Close`: diff --git a/frontend/src/app/layout/toolbar/toolbar.component.html b/frontend/src/app/layout/toolbar/toolbar.component.html index 9a3136eb22..0bdd8f4ad4 100644 --- a/frontend/src/app/layout/toolbar/toolbar.component.html +++ b/frontend/src/app/layout/toolbar/toolbar.component.html @@ -1,12 +1,12 @@ -
+
+ {{ title }} @if (!isMobile) { - {{ title }} }
@@ -14,9 +14,9 @@ @if (!isMobile || (isMobile && errors.length)) { } -
+
- @if (haveNextBP) { + @if (haveNextBP && !isAllNodesPage) { }
diff --git a/frontend/src/app/layout/toolbar/toolbar.component.scss b/frontend/src/app/layout/toolbar/toolbar.component.scss index d1548b4f39..71c8f6be53 100644 --- a/frontend/src/app/layout/toolbar/toolbar.component.scss +++ b/frontend/src/app/layout/toolbar/toolbar.component.scss @@ -3,7 +3,7 @@ :host { height: 40px; @media (max-width: 767px) { - height: 56px; + height: 96px; } } @@ -34,7 +34,6 @@ .server-pill { @media (max-width: 767px) { flex-direction: row-reverse; - margin: 0 8px; gap: 8px; mina-server-status, mina-block-production-pill { @@ -73,9 +72,9 @@ @media (max-width: 767px) { :host { border: none !important; - } - .toolbar { - background-color: $base-surface; + .title { + font-size: 24px !important; + } } } diff --git a/frontend/src/app/layout/toolbar/toolbar.component.ts b/frontend/src/app/layout/toolbar/toolbar.component.ts index ee3616e17d..4c66ec1860 100644 --- a/frontend/src/app/layout/toolbar/toolbar.component.ts +++ b/frontend/src/app/layout/toolbar/toolbar.component.ts @@ -9,13 +9,14 @@ import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { selectErrorPreviewErrors } from '@error-preview/error-preview.state'; import { MinaError } from '@shared/types/error-preview/mina-error.type'; import { AppNodeStatus } from '@shared/types/app/app-node-details.type'; +import { Routes } from '@shared/enums/routes.enum'; @Component({ selector: 'mina-toolbar', templateUrl: './toolbar.component.html', styleUrls: ['./toolbar.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - host: { class: 'flex-row align-center border-bottom' }, + host: { class: 'flex-row align-center' }, }) export class ToolbarComponent extends StoreDispatcher implements OnInit { @@ -23,12 +24,14 @@ export class ToolbarComponent extends StoreDispatcher implements OnInit { isMobile: boolean; errors: MinaError[] = []; haveNextBP: boolean; + isAllNodesPage: boolean; @ViewChild('loadingRef') private loadingRef: ElementRef; constructor(private tooltipService: TooltipService) { super(); } ngOnInit(): void { + this.isAllNodesPage = location.pathname.includes(Routes.NODES + '/' + Routes.OVERVIEW); this.listenToRouterChange(); this.listenToMenuChange(); this.listenToLoading(); diff --git a/frontend/src/app/shared/base-classes/mina-table-rust-wrapper.class.ts b/frontend/src/app/shared/base-classes/mina-table-rust-wrapper.class.ts index 569deb4533..05ccb62014 100644 --- a/frontend/src/app/shared/base-classes/mina-table-rust-wrapper.class.ts +++ b/frontend/src/app/shared/base-classes/mina-table-rust-wrapper.class.ts @@ -1,8 +1,8 @@ import { Directive, OnInit } from '@angular/core'; import { AppSelectors } from '@app/app.state'; import { AppMenu } from '@shared/types/app/app-menu.type'; -import { MinaTableWrapper } from '@openmina/shared'; import { MinaState } from '@app/app.setup'; +import { MinaTableWrapper } from '@shared/base-classes/mina-table-wrapper.class'; @Directive() export abstract class MinaTableRustWrapper extends MinaTableWrapper implements OnInit { diff --git a/frontend/src/app/shared/base-classes/mina-table-wrapper.class.ts b/frontend/src/app/shared/base-classes/mina-table-wrapper.class.ts new file mode 100644 index 0000000000..47df6db829 --- /dev/null +++ b/frontend/src/app/shared/base-classes/mina-table-wrapper.class.ts @@ -0,0 +1,33 @@ +import { Directive, OnInit, TemplateRef, ViewChild, ViewContainerRef } from '@angular/core'; +import { MinaTableComponent } from '../components/mina-table/mina-table.component'; +import { BaseStoreDispatcher, TableColumnList } from '@openmina/shared'; + +@Directive() +export abstract class MinaTableWrapper extends BaseStoreDispatcher implements OnInit { + + protected abstract readonly tableHeads: TableColumnList; + + @ViewChild('rowTemplate') protected rowTemplate: TemplateRef<{ row: T, i: number }>; + @ViewChild('minaTable', { read: ViewContainerRef }) protected containerRef: ViewContainerRef; + + public table: MinaTableComponent; + + async ngOnInit(): Promise { + await import('../components/mina-table/mina-table.component').then(c => { + this.table = this.containerRef.createComponent(c.MinaTableComponent).instance; + this.table.tableHeads = this.tableHeads; + this.table.rowTemplate = this.rowTemplate; + this.table.rowClickCallback = (row: T, isRealClick: boolean = true) => this.onRowClick(row, isRealClick); + this.setupTable(); + this.table.init(); + }); + } + + protected checkViewport(isMobile: boolean): void { + this.table.checkViewport(isMobile); + } + + protected abstract setupTable(): void; + + protected onRowClick(row: T, isRealClick: boolean): void { } +} diff --git a/frontend/src/app/shared/components/mina-card/mina-card.component.ts b/frontend/src/app/shared/components/mina-card/mina-card.component.ts index 9681cbd29a..1ecd6b792d 100644 --- a/frontend/src/app/shared/components/mina-card/mina-card.component.ts +++ b/frontend/src/app/shared/components/mina-card/mina-card.component.ts @@ -5,7 +5,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; templateUrl: './mina-card.component.html', styleUrls: ['./mina-card.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - host: { class: 'flex-column flex-between pt-8 pb-8 pl-12 border-rad-8 bg-surface' }, + host: { class: 'flex-column flex-between pt-8 pb-8 pl-12 border-rad-8' }, }) export class MinaCardComponent { diff --git a/frontend/src/app/shared/components/mina-table/mina-table.component.html b/frontend/src/app/shared/components/mina-table/mina-table.component.html new file mode 100644 index 0000000000..bcbde1b6ef --- /dev/null +++ b/frontend/src/app/shared/components/mina-table/mina-table.component.html @@ -0,0 +1,57 @@ +
+ +
+ + {{ th.name }} + info + arrow_upward + + +
+ +
+ {{ th.name }} +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+
diff --git a/frontend/src/app/shared/components/mina-table/mina-table.component.scss b/frontend/src/app/shared/components/mina-table/mina-table.component.scss new file mode 100644 index 0000000000..9eb3be7a1c --- /dev/null +++ b/frontend/src/app/shared/components/mina-table/mina-table.component.scss @@ -0,0 +1,251 @@ +@import 'openmina'; + +::ng-deep .mina-table { + @include flexColumn(); + + .row { + height: 36px; + display: grid; + color: $base-tertiary; + + > span { + height: 36px; + line-height: 36px; + padding-left: 12px; + } + + &.active { + background-color: $selected-container; + + > span, a { + color: $selected-primary !important; + } + } + + &:not(.head) { + cursor: pointer; + } + + &.sorting.p-relative:last-child { + overflow: hidden; + } + + &:hover:not(.active):not(.head) { + background-color: $base-divider; + + * { + color: $base-primary !important; + } + } + + &.head { + font-weight: 600; + color: $base-tertiary; + text-transform: capitalize; + + &.sorting { + > span { + @include flexRowVertCenter(); + + .mina-icon.info { + font-variation-settings: 'FILL' 0, 'wght' 300; + margin-left: 4px; + font-size: 20px; + } + + .mina-icon.dir { + transition: 0.2s ease-in-out; + transform: rotateX(0) translateY(6px); + margin-top: 1px; + margin-left: 2px; + opacity: 0; + font-size: 18px; + + &.show { + opacity: 1; + transform: rotateX(0) translateY(0); + } + + &.flip { + transform: rotateX(180deg) translateY(0); + + &:not(.show) { + transform: rotateX(180deg) translateY(6px); + } + } + } + + &:hover, + &.active { + color: $base-primary; + transition: 200ms; + + .mina-icon:not(.show):not(.info) { + opacity: 0.5; + transform: rotateX(0) translateY(0); + + &.flip { + transform: rotateX(180deg) translateY(0); + } + } + } + } + } + } + + .underline { + line-height: 12px; + cursor: pointer; + + &:hover { + text-decoration: underline; + } + } + + span mina-copy .cpy { + opacity: 0; + } + + span:hover mina-copy .cpy { + opacity: 1; + } + } + + &.active { + background-color: blue; + color: #fff; + } + + .cdk-virtual-scroll-viewport { + overflow-x: hidden; + //@media (max-width: 768px) { + // padding-bottom: 80px; + //} + } +} + +::ng-deep { + .to-top { + display: none; + } + + @media (max-width: 767px) { + .to-top { + display: block; + position: fixed; + rotate: -90deg; + color: $base-secondary; + left: -1000px; + + &.hide { + animation: bounceHide 0.5s cubic-bezier(0.5, 0.1, 0.5, 1.25) forwards; + } + + &:not(.hide) { + animation: bounceShow 0.5s cubic-bezier(0.17, 0.67, 0.83, 0.67) forwards; + } + } + + .mina-table { + .row { + span { + font-size: 12px; + } + + &.head { + .mina-icon.info { + font-size: 16px; + } + + .mina-icon.dir { + font-size: 14px; + } + } + } + } + //.cdk-virtual-scroll-content-wrapper { + // width: 100%; + //} + + //.mina-table { + // .row { + // height: initial; + // display: flex; + // background-color: initial !important; + // padding: 5px 10px; + // + // .mob-row { + // padding: 0 10px; + // outline: 1px solid $base-divider; + // background-color: $base-surface; + // border-radius: 6px; + // width: 100%; + // display: flex; + // flex-direction: row; + // justify-content: space-between; + // font-size: 12px; + // overflow: hidden; + // + // .th, .td { + // display: flex; + // flex-direction: column; + // + // span { + // height: 26px; + // line-height: 26px; + // } + // } + // + // .th { + // text-transform: capitalize; + // } + // + // .td { + // flex: 1; + // min-width: 0; + // align-items: flex-end; + // + // span { + // max-width: 100%; + // } + // } + // + // span mina-copy .cpy { + // opacity: 1; + // margin-right: -5px; + // } + // } + // } + //} + } +} + +@keyframes bounceHide { + 0% { + opacity: 1; + transform: translateX(0); + } + 30% { + opacity: 0; + transform: translateX(-20px); + } + 100% { + opacity: 0; + transform: translateX(-500px); + } +} + +@keyframes bounceShow { + 0% { + opacity: 0; + transform: translateX(-500px); + } + 70% { + opacity: 0; + transform: translateX(-20px); + } + 100% { + opacity: 1; + transform: translateX(0); + } +} diff --git a/frontend/src/app/shared/components/mina-table/mina-table.component.ts b/frontend/src/app/shared/components/mina-table/mina-table.component.ts new file mode 100644 index 0000000000..ee5c06c0db --- /dev/null +++ b/frontend/src/app/shared/components/mina-table/mina-table.component.ts @@ -0,0 +1,156 @@ +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Inject, TemplateRef, ViewChild } from '@angular/core'; +import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { untilDestroyed } from '@ngneat/until-destroy'; +import { debounceTime } from 'rxjs'; +import { CommonModule, DOCUMENT } from '@angular/common'; +import { ActionCreator } from '@ngrx/store'; +import { TypedAction } from '@ngrx/store/src/models'; +import { SharedModule } from '@shared/shared.module'; +import { BaseStoreDispatcher, hasValue, isMobile, SortDirection, TableColumnList, TableSort } from '@openmina/shared'; + +const DESKTOP_ROW_HEIGHT = 36; + +@Component({ + standalone: true, + imports: [SharedModule, CommonModule], + selector: 'mina-table', + templateUrl: './mina-table.component.html', + styleUrls: ['./mina-table.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'h-100 flex-column' }, +}) +export class MinaTableComponent extends BaseStoreDispatcher implements AfterViewInit { + + rowSize: number = DESKTOP_ROW_HEIGHT; + isMobile: boolean; + + rows: T[] = []; + activeRow: T; + tableHeads: TableColumnList; + rowTemplate: TemplateRef<{ row: T, i: number }>; + currentSort: TableSort; + thGroupsTemplate: TemplateRef; + propertyForActiveCheck: keyof T; + gridTemplateColumns: Array = []; + minWidth: number; + sortClz: new (payload: TableSort) => { type: string, payload: TableSort }; + sortAction: ActionCreator; }) => { sort: TableSort; } & TypedAction>; + sortSelector: (state: any) => TableSort; + rowClickCallback: (row: T, isRealClick: boolean) => void; + trackByFn: (index: number, row: T) => any = (_: number, row: T) => row; + + tableLevel: number = 1; + + @ViewChild(CdkVirtualScrollViewport) private vs: CdkVirtualScrollViewport; + @ViewChild('toTop') private toTop: ElementRef; + private hiddenToTop: boolean = true; + + constructor(@Inject(DOCUMENT) private document: Document, + private el: ElementRef) { super(); } + + init(): void { + this.minWidth = this.minWidth || this.gridTemplateColumns.reduce((acc: number, curr: number | string) => acc + Number(curr), 0); + this.addGridTemplateColumnsInCssFile(); + this.listenToSortingChanges(); + this.detect(); + } + + ngAfterViewInit(): void { + this.listenToScrolling(); + this.positionToTop(); + } + + private addGridTemplateColumnsInCssFile(): void { + let value = `mina-table #table${this.tableLevel}.mina-table .row{grid-template-columns:`; + this.gridTemplateColumns.forEach(v => value += typeof v === 'number' ? `${v}px ` : `${v} `); + this.document.getElementById('table-style' + this.tableLevel).textContent = value + '}'; + } + + sortTable(sortBy: string | keyof T): void { + const sortDirection = sortBy !== this.currentSort.sortBy + ? this.currentSort.sortDirection + : this.currentSort.sortDirection === SortDirection.ASC ? SortDirection.DSC : SortDirection.ASC; + const sort = { sortBy: sortBy as keyof T, sortDirection }; + if (this.sortClz) { + this.dispatch(this.sortClz, sort); + } else if (this.sortAction) { + this.dispatch2(this.sortAction({ sort })); + } + } + + scrollToTop(): void { + this.vs.scrollToIndex(0, 'smooth'); + this.toTop.nativeElement.classList.add('hide'); + this.hiddenToTop = true; + } + + scrollToElement(rowFinder: (row: T) => boolean): void { + const topElements = Math.round(this.vs.elementRef.nativeElement.offsetHeight / 2 / this.rowSize) - 3; + const jobIndex = this.rows.findIndex(rowFinder); + this.vs.scrollToIndex(jobIndex - topElements); + } + + get virtualScroll(): CdkVirtualScrollViewport { + return this.vs; + } + + private listenToScrolling(): void { + this.vs.scrolledIndexChange + .pipe(debounceTime(this.hiddenToTop ? 200 : 0), untilDestroyed(this)) + .subscribe(index => { + if (index === 0) { + this.toTop.nativeElement.classList.add('hide'); + } else { + this.toTop.nativeElement.classList.remove('hide'); + } + this.hiddenToTop = index === 0; + }); + } + + private listenToSortingChanges(): void { + if (!this.sortSelector) return; + this.select(this.sortSelector, (sort: TableSort) => { + this.currentSort = sort; + this.detect(); + }); + } + + checkViewport(isMobile: boolean): void { + // if (this.isMobile !== isMobile) { + // this.isMobile = isMobile; + // this.rowSize = isMobile ? (26 * this.tableHeads.length + 10) : DESKTOP_ROW_HEIGHT; + // this.vs?.checkViewportSize(); + // this.detect(); + // } + } + + private positionToTop(): void { + if (!isMobile()) { + return; + } + const rect = this.el.nativeElement.getBoundingClientRect(); + + this.toTop.nativeElement.style.top = `${rect.top + rect.height - 60}px`; + this.toTop.nativeElement.style.left = `${rect.left + rect.width - 60}px`; + } + + onVsClick(event: MouseEvent): void { + let target = event.target as any; + let idx: number = null; + while (target && target.getAttribute) { + let attrValue = target.getAttribute('idx'); + if (attrValue) { + attrValue = Number(attrValue); + idx = attrValue; + } + if (hasValue(idx) || target === this.vs.elementRef.nativeElement) { + break; + } + target = target.parentElement; + } + + if (hasValue(idx)) { + this.rowClickCallback(this.rows[idx], true); + } + } +} diff --git a/frontend/src/assets/styles/openmina.scss b/frontend/src/assets/styles/openmina.scss index 76ee9fa200..2e13e54f52 100644 --- a/frontend/src/assets/styles/openmina.scss +++ b/frontend/src/assets/styles/openmina.scss @@ -292,6 +292,11 @@ $raleway-font: 'Raleway', sans-serif; flex-direction: column; } + .flex-column-reverse-sm { + display: flex; + flex-direction: column-reverse; + } + .flex-between-sm { justify-content: space-between; } @@ -914,176 +919,6 @@ textarea { - -.mina-table { - @include flexColumn(); - - .row { - height: 36px; - display: grid; - - &.row-even { - background-color: $base-container; - } - - &.active { - background-color: $selected-container; - - > span, a { - color: $selected-primary !important; - } - } - - > span { - height: 36px; - line-height: 36px; - padding-left: 12px; - } - - &:hover:not(.active):not(.head) { - background-color: $base-divider; - - * { - color: $base-primary !important; - } - } - - .underline { - line-height: 12px; - cursor: pointer; - - &:hover { - text-decoration: underline; - } - } - - &.head { - font-weight: 600; - color: $base-tertiary; - text-transform: capitalize; - - &.sorting { - > span { - @include flexRowVertCenter(); - - .mina-icon.info { - font-variation-settings: 'FILL' 0, 'wght' 300; - margin-left: 4px; - } - - .mina-icon:not(.info) { - transition: 0.2s ease-in-out; - transform: rotateX(0) translateY(6px); - margin-top: 1px; - margin-left: 2px; - opacity: 0; - - &.show { - opacity: 1; - transform: rotateX(0) translateY(0); - } - - &.flip { - transform: rotateX(180deg) translateY(0); - - &:not(.show) { - transform: rotateX(180deg) translateY(6px); - } - } - } - - &:hover, - &.active { - color: $base-primary; - transition: 200ms; - - .mina-icon:not(.show):not(.info) { - opacity: 0.5; - transform: rotateX(0) translateY(0); - - &.flip { - transform: rotateX(180deg) translateY(0); - } - } - } - } - } - } - - span mina-copy .cpy { - opacity: 0; - } - - span:hover mina-copy .cpy { - opacity: 1; - } - } - - &.active { - background-color: blue; - color: #fff; - } -} - -@media (max-width: 767px) { - .cdk-virtual-scroll-content-wrapper { - width: 100%; - } - - .mina-table { - .row { - height: initial; - display: flex; - background-color: initial !important; - padding: 5px 10px; - - .mob-row { - padding: 0 10px; - outline: 1px solid $base-divider; - background-color: $base-surface; - border-radius: 6px; - width: 100%; - display: flex; - flex-direction: row; - justify-content: space-between; - font-size: 12px; - overflow: hidden; - - .th, .td { - display: flex; - flex-direction: column; - - span { - height: 26px; - line-height: 26px; - } - } - - .th { - text-transform: capitalize; - } - - .td { - flex: 1; - min-width: 0; - align-items: flex-end; - - span { - max-width: 100%; - } - } - - span mina-copy .cpy { - opacity: 1; - margin-right: -5px; - } - } - } - } -} - - - $z-index-bigger-than-cdk-overlay: 1001; #mina-tooltip { top: 0; @@ -2126,3 +1961,4 @@ span.mina-icon { color: $code-magenta !important; } + diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index 19d7453872..c4aeaa7a67 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -14,8 +14,8 @@ export const environment: Readonly = { snarks: ['scan-state', 'work-pool'], resources: ['memory'], 'block-production': ['won-slots'], - // mempool: [], - // benchmarks: ['wallets'], + mempool: [], + benchmarks: ['wallets'], // zk: ['test'], }, graphQL: 'https://adonagy.com/graphql', @@ -39,26 +39,26 @@ export const environment: Readonly = { // name: 'Producer-2', // url: 'https://staging-devnet-openmina-bp-2-dashboard.minaprotocol.network', // }, - // { - // name: 'staging-devnet-bp-0', - // url: 'https://staging-devnet-openmina-bp-0.minaprotocol.network', - // }, - // { - // name: 'staging-devnet-bp-1', - // url: 'https://staging-devnet-openmina-bp-1.minaprotocol.network', - // }, - // { - // name: 'staging-devnet-bp-2', - // url: 'https://staging-devnet-openmina-bp-2.minaprotocol.network', - // }, - // { - // name: 'staging-devnet-bp-3', - // url: 'https://staging-devnet-openmina-bp-3.minaprotocol.network', - // }, { - name: 'Web Node 1', - isWebNode: true, + name: 'staging-devnet-bp-0', + url: 'https://staging-devnet-openmina-bp-0.minaprotocol.network', + }, + { + name: 'staging-devnet-bp-1', + url: 'https://staging-devnet-openmina-bp-1.minaprotocol.network', + }, + { + name: 'staging-devnet-bp-2', + url: 'https://staging-devnet-openmina-bp-2.minaprotocol.network', }, + { + name: 'staging-devnet-bp-3', + url: 'https://staging-devnet-openmina-bp-3.minaprotocol.network', + }, + // { + // name: 'Web Node 1', + // isWebNode: true, + // }, // { // name: 'http://65.109.105.40:3000', // url: 'http://65.109.105.40:3000', @@ -82,14 +82,14 @@ export const environment: Readonly = { name: 'Docker 11010', url: 'http://localhost:11010', }, - // { - // name: 'Docker 11012', - // url: 'http://localhost:11012', - // }, - // { - // name: 'Docker 11014', - // url: 'http://localhost:11014', - // }, + { + name: 'Docker 11012', + url: 'http://localhost:11012', + }, + { + name: 'Docker 11014', + url: 'http://localhost:11014', + }, // { // name: 'Producer', // url: 'http://65.109.105.40:3000', diff --git a/frontend/src/index.html b/frontend/src/index.html index b650c0cd47..e2887718bd 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -54,11 +54,11 @@ From 35d81ca3027200982cd262c7e69803f6e95f1c28 Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Thu, 21 Nov 2024 22:45:17 +0200 Subject: [PATCH 088/175] Http conf --- frontend/httpd.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 168d4180cf..3e91bc3338 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -211,8 +211,8 @@ LoadModule rewrite_module modules/mod_rewrite.so RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d RewriteRule ^ - [L] - # Rewrite all other requests to index.html - RewriteRule ^(.*)$ /index.html [L] + # If the requested resource doesn't exist, use index.html + RewriteRule ^ /index.html SSLProxyEngine On @@ -500,6 +500,7 @@ LogLevel warn AddType application/x-gzip .gz .tgz AddType application/wasm .wasm AddType application/javascript .js + AddType text/javascript .js # # AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server From aa451ca9b2c4dfdf2063535f2e4007f9c6c65a3e Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Thu, 21 Nov 2024 22:45:17 +0200 Subject: [PATCH 089/175] Http conf Apache conf --- frontend/httpd.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/httpd.conf b/frontend/httpd.conf index 168d4180cf..d49b70c006 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -199,9 +199,10 @@ LoadModule alias_module modules/mod_alias.so LoadModule rewrite_module modules/mod_rewrite.so + RewriteEngine On - # Exclude /openmina-node from the general rewrite rules + # Exclude specific paths from rewriting if needed RewriteCond %{REQUEST_URI} ^/openmina-node/ [NC,OR] RewriteCond %{REQUEST_URI} ^/mina/webrtc/signal [NC] RewriteRule ^ - [L] @@ -211,8 +212,8 @@ LoadModule rewrite_module modules/mod_rewrite.so RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d RewriteRule ^ - [L] - # Rewrite all other requests to index.html - RewriteRule ^(.*)$ /index.html [L] + # If the requested resource doesn't exist, use index.html + RewriteRule ^ /index.html SSLProxyEngine On @@ -500,6 +501,7 @@ LogLevel warn AddType application/x-gzip .gz .tgz AddType application/wasm .wasm AddType application/javascript .js + AddType text/javascript .js # # AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server From 563d9f97c1494ab5eb5b29c60ea511611bf7e14b Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Fri, 22 Nov 2024 10:36:26 +0400 Subject: [PATCH 090/175] feat(invariants): add support for cluster level, global invariants --- cli/replay_dynamic_effects/src/lib.rs | 4 +- core/src/invariants.rs | 15 ++++++++ node/common/src/service/service.rs | 4 +- node/invariants/src/invariant_result.rs | 6 +++ node/invariants/src/lib.rs | 49 +++++++++++++++++++++---- node/testing/src/cluster/mod.rs | 11 +++++- node/testing/src/service/mod.rs | 31 +++++++++++++++- 7 files changed, 107 insertions(+), 13 deletions(-) diff --git a/cli/replay_dynamic_effects/src/lib.rs b/cli/replay_dynamic_effects/src/lib.rs index 29b7bcc3b4..f788b95c75 100644 --- a/cli/replay_dynamic_effects/src/lib.rs +++ b/cli/replay_dynamic_effects/src/lib.rs @@ -1,5 +1,5 @@ use ::node::{ActionWithMeta, Store}; -use openmina_node_invariants::{InvariantResult, Invariants}; +use openmina_node_invariants::{InvariantIgnoreReason, InvariantResult, Invariants}; use openmina_node_native::NodeService; pub mod ret { @@ -33,6 +33,8 @@ extern "C" fn replay_dynamic_effects( ) -> u8 { for (invariant, res) in Invariants::check_all(store, action) { match res { + InvariantResult::Ignored(InvariantIgnoreReason::GlobalInvariantNotInTestingCluster) => { + } InvariantResult::Violation(violation) => { eprintln!( "Invariant({}) violated! violation: {violation}", diff --git a/core/src/invariants.rs b/core/src/invariants.rs index 3ab2861eee..727a11bc63 100644 --- a/core/src/invariants.rs +++ b/core/src/invariants.rs @@ -1,7 +1,22 @@ use std::any::Any; pub trait InvariantService: redux::Service { + type ClusterInvariantsState<'a>: 'a + std::ops::DerefMut + where + Self: 'a; + + fn node_id(&self) -> usize { + 0 + } + fn invariants_state(&mut self) -> &mut InvariantsState; + + fn cluster_invariants_state<'a>(&'a mut self) -> Option> + where + Self: 'a, + { + None + } } #[derive(Default)] diff --git a/node/common/src/service/service.rs b/node/common/src/service/service.rs index cb296af0a3..c13674fbcb 100644 --- a/node/common/src/service/service.rs +++ b/node/common/src/service/service.rs @@ -181,7 +181,9 @@ impl node::service::TransitionFrontierGenesisService for NodeService { } impl node::core::invariants::InvariantService for NodeService { - fn invariants_state(&mut self) -> &mut node::core::invariants::InvariantsState { + type ClusterInvariantsState<'a> = std::cell::RefMut<'a, InvariantsState>; + + fn invariants_state(&mut self) -> &mut InvariantsState { &mut self.invariants_state } } diff --git a/node/invariants/src/invariant_result.rs b/node/invariants/src/invariant_result.rs index 595307b5b3..6b6f3df40b 100644 --- a/node/invariants/src/invariant_result.rs +++ b/node/invariants/src/invariant_result.rs @@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, Clone)] pub enum InvariantResult { + Ignored(InvariantIgnoreReason), /// Invariant check was triggered but as a result we didn't do any /// checks, instead internal state of invariant might have been updated. Updated, @@ -10,3 +11,8 @@ pub enum InvariantResult { /// Invariant check was done and it passed. Ok, } + +#[derive(Serialize, Deserialize, Debug, Clone)] +pub enum InvariantIgnoreReason { + GlobalInvariantNotInTestingCluster, +} diff --git a/node/invariants/src/lib.rs b/node/invariants/src/lib.rs index ce7d4a925f..c73ed9d45b 100644 --- a/node/invariants/src/lib.rs +++ b/node/invariants/src/lib.rs @@ -1,5 +1,5 @@ mod invariant_result; -pub use invariant_result::InvariantResult; +pub use invariant_result::{InvariantIgnoreReason, InvariantResult}; pub mod no_recursion; use no_recursion::*; @@ -11,7 +11,7 @@ pub use node::core::invariants::{InvariantService, InvariantsState}; use strum_macros::{EnumDiscriminants, EnumIter, EnumString, IntoStaticStr}; -use node::{ActionKind, ActionWithMeta, Store}; +use node::{ActionKind, ActionWithMeta, Service, Store}; pub trait Invariant { /// Internal state of the invariant. @@ -20,6 +20,11 @@ pub trait Invariant { /// this is the place. type InternalState: 'static + Send + Default; + /// Whether or not invariant is cluster-wide, or for just local node. + fn is_global(&self) -> bool { + false + } + /// Invariant triggers define a list actions, which should cause /// `Invariant::check` to be called. /// @@ -27,11 +32,11 @@ pub trait Invariant { fn triggers(&self) -> &[ActionKind]; /// Checks the state for invariant violation. - fn check( + fn check( self, internal_state: &mut Self::InternalState, store: &Store, - _action: &ActionWithMeta, + action: &ActionWithMeta, ) -> InvariantResult; } @@ -48,21 +53,49 @@ macro_rules! define_invariants_enum { InvariantsDiscriminants::from(self) as usize } + pub fn is_global(&self) -> bool { + match self { + $(Self::$invariant(invariant) => invariant.is_global(),)* + } + } + pub fn triggers(&self) -> &[ActionKind] { match self { $(Self::$invariant(invariant) => invariant.triggers(),)* } } - pub fn check(self, store: &mut Store, action: &ActionWithMeta) -> InvariantResult { - let mut invariants_state = store.service.invariants_state().take(); + pub fn check( + self, + store: &mut Store, + action: &ActionWithMeta, + ) -> InvariantResult { + let mut invariants_state = if self.is_global() { + match store.service.cluster_invariants_state() { + Some(mut v) => v.take(), + None => return InvariantResult::Ignored(InvariantIgnoreReason::GlobalInvariantNotInTestingCluster), + } + } else { + store.service.invariants_state().take() + }; + let res = match self { $(Self::$invariant(invariant) => { let invariant_state = invariants_state.get(self.index()); invariant.check(invariant_state, store, action) })* }; - *store.service.invariants_state() = invariants_state; + + if self.is_global() { + match store.service.cluster_invariants_state() { + Some(mut s) => + *s = invariants_state, + None => unreachable!("function should have returned above"), + } + } else { + *store.service.invariants_state() = invariants_state; + }; + res } } @@ -94,7 +127,7 @@ impl Invariants { ::iter() } - pub fn check_all<'a, S: InvariantService>( + pub fn check_all<'a, S: Service + InvariantService>( store: &'a mut Store, action: &'a ActionWithMeta, ) -> impl 'a + Iterator { diff --git a/node/testing/src/cluster/mod.rs b/node/testing/src/cluster/mod.rs index 6cf7084b6d..c65d65d242 100644 --- a/node/testing/src/cluster/mod.rs +++ b/node/testing/src/cluster/mod.rs @@ -11,6 +11,7 @@ pub mod runner; use std::collections::BTreeMap; use std::io::Read; use std::path::{Path, PathBuf}; +use std::sync::Mutex as StdMutex; use std::time::Duration; use std::{collections::VecDeque, sync::Arc}; @@ -21,6 +22,7 @@ use node::account::{AccountPublicKey, AccountSecretKey}; use node::core::channels::mpsc; use node::core::consensus::ConsensusConstants; use node::core::constants::constraint_constants; +use node::core::invariants::InvariantsState; use node::core::log::system_time; use node::core::requests::RpcId; use node::core::{thread, warn}; @@ -134,6 +136,7 @@ pub struct Cluster { work_verifier_index: TransactionVerifier, debugger: Option, + invariants_state: Arc>, } #[derive(Serialize)] @@ -174,6 +177,7 @@ impl Cluster { work_verifier_index: TransactionVerifier::make(), debugger, + invariants_state: Arc::new(StdMutex::new(Default::default())), } } @@ -342,7 +346,9 @@ impl Cluster { }) .unwrap(); - let mut service = NodeTestingService::new(real_service, node_id, shutdown_rx); + let invariants_state = self.invariants_state.clone(); + let mut service = + NodeTestingService::new(real_service, node_id, invariants_state, shutdown_rx); service.set_proof_kind(self.config.proof_kind()); if self.config.all_rust_to_rust_use_webrtc() { @@ -365,6 +371,9 @@ impl Cluster { for (invariant, res) in Invariants::check_all(store, &action) { // TODO(binier): record instead of panicing. match res { + InvariantResult::Ignored(reason) => { + unreachable!("No invariant should be ignored! ignore reason: {reason:?}"); + } InvariantResult::Violation(violation) => { panic!( "Invariant({}) violated! violation: {violation}", diff --git a/node/testing/src/service/mod.rs b/node/testing/src/service/mod.rs index 1aa535bc6a..e3f158ab19 100644 --- a/node/testing/src/service/mod.rs +++ b/node/testing/src/service/mod.rs @@ -1,6 +1,7 @@ mod rpc_service; use std::collections::VecDeque; +use std::sync::Mutex as StdMutex; use std::time::Duration; use std::{collections::BTreeMap, sync::Arc}; @@ -20,6 +21,7 @@ use node::account::AccountPublicKey; use node::block_producer::vrf_evaluator::VrfEvaluatorInput; use node::block_producer::BlockProducerEvent; use node::core::channels::mpsc; +use node::core::invariants::InvariantsState; use node::core::snark::{Snark, SnarkJobId}; use node::external_snark_worker_effectful::ExternalSnarkWorkerEvent; use node::p2p::service_impl::webrtc_with_libp2p::P2pServiceWebrtcWithLibp2p; @@ -134,12 +136,19 @@ pub struct NodeTestingService { dyn_effects: Option, snarker_sok_digest: Option, + + cluster_invariants_state: Arc>, /// Once dropped, it will cause all threads associated to shutdown. _shutdown: mpsc::Receiver<()>, } impl NodeTestingService { - pub fn new(real: NodeService, id: ClusterNodeId, _shutdown: mpsc::Receiver<()>) -> Self { + pub fn new( + real: NodeService, + id: ClusterNodeId, + cluster_invariants_state: Arc>, + _shutdown: mpsc::Receiver<()>, + ) -> Self { Self { real, id, @@ -150,6 +159,7 @@ impl NodeTestingService { pending_events: PendingEvents::new(), dyn_effects: None, snarker_sok_digest: None, + cluster_invariants_state, _shutdown, } } @@ -643,7 +653,24 @@ impl ExternalSnarkWorkerService for NodeTestingService { } impl node::core::invariants::InvariantService for NodeTestingService { - fn invariants_state(&mut self) -> &mut openmina_core::invariants::InvariantsState { + type ClusterInvariantsState<'a> = std::sync::MutexGuard<'a, InvariantsState>; + + fn node_id(&self) -> usize { + self.node_id().index() + } + + fn invariants_state(&mut self) -> &mut InvariantsState { node::core::invariants::InvariantService::invariants_state(&mut self.real) } + + fn cluster_invariants_state<'a>(&'a mut self) -> Option> + where + Self: 'a, + { + Some( + self.cluster_invariants_state.try_lock().expect( + "locking should never fail, since we are running all nodes in the same thread", + ), + ) + } } From b1fb597f2516fddf229c67fe601a87d77e1060b1 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Fri, 22 Nov 2024 10:36:49 +0400 Subject: [PATCH 091/175] fix(p2p/webrtc): snark pool propagation --- p2p/src/channels/snark/p2p_channels_snark_actions.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/p2p/src/channels/snark/p2p_channels_snark_actions.rs b/p2p/src/channels/snark/p2p_channels_snark_actions.rs index 5a272c9201..cfe2171350 100644 --- a/p2p/src/channels/snark/p2p_channels_snark_actions.rs +++ b/p2p/src/channels/snark/p2p_channels_snark_actions.rs @@ -20,10 +20,12 @@ pub enum P2pChannelsSnarkAction { Ready { peer_id: PeerId, }, + #[action_event(level = debug, fields(display(peer_id), limit))] RequestSend { peer_id: PeerId, limit: u8, }, + #[action_event(level = debug, fields(display(peer_id), promised_count))] PromiseReceived { peer_id: PeerId, promised_count: u8, @@ -32,10 +34,12 @@ pub enum P2pChannelsSnarkAction { peer_id: PeerId, snark: Box, }, + #[action_event(level = debug, fields(display(peer_id), limit))] RequestReceived { peer_id: PeerId, limit: u8, }, + #[action_event(level = debug, fields(display(peer_id), snarks = snarks.len(), first_index, last_index))] ResponseSend { peer_id: PeerId, snarks: Vec, @@ -144,7 +148,7 @@ impl redux::EnablingCondition for P2pChannelsSnarkAction { last_index, } => { !snarks.is_empty() - && first_index < last_index + && first_index <= last_index && state .get_ready_peer(peer_id) .map_or(false, |p| match &p.channels.snark { From fc25748da7e291d399eeb220f89b552059108e52 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Fri, 22 Nov 2024 14:00:10 +0400 Subject: [PATCH 092/175] feat(node/rpc): add rpc to fetch build information --- Cargo.lock | 1 + node/native/src/http_server.rs | 5 +++++ node/web/Cargo.toml | 1 + node/web/src/lib.rs | 6 ++++++ 4 files changed, 13 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index d1f047edb3..c31b91930d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4785,6 +4785,7 @@ dependencies = [ "bytes", "console_error_panic_hook", "derive_more", + "gloo-utils", "jsonpath-rust", "libp2p-identity", "mina-p2p-messages", diff --git a/node/native/src/http_server.rs b/node/native/src/http_server.rs index e62ca24f79..05dc4b675c 100644 --- a/node/native/src/http_server.rs +++ b/node/native/src/http_server.rs @@ -27,6 +27,10 @@ macro_rules! compose_route { } pub async fn run(port: u16, rpc_sender: RpcSender) { + let build_env_get = warp::path!("build_env") + .and(warp::get()) + .then(move || async { with_json_reply(&node::BuildEnv::get(), StatusCode::OK) }); + #[cfg(feature = "p2p-webrtc")] let signaling = { use node::p2p::{ @@ -564,6 +568,7 @@ pub async fn run(port: u16, rpc_sender: RpcSender) { #[cfg(feature = "p2p-webrtc")] let routes = signaling.or(state_get).or(state_post); let routes = compose_route!( + build_env_get, routes, status, peers_get, diff --git a/node/web/Cargo.toml b/node/web/Cargo.toml index cfe6643e87..f39bf26015 100644 --- a/node/web/Cargo.toml +++ b/node/web/Cargo.toml @@ -28,6 +28,7 @@ jsonpath-rust = "0.5.0" wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" console_error_panic_hook = "0.1" +gloo-utils = "0.2" openmina-node-common = { path = "../common" } node = { path = "../../node" } diff --git a/node/web/src/lib.rs b/node/web/src/lib.rs index 02563f467d..c1b4f852cc 100644 --- a/node/web/src/lib.rs +++ b/node/web/src/lib.rs @@ -13,6 +13,7 @@ use ::node::account::AccountSecretKey; use ::node::core::thread; use ::node::snark::{BlockVerifier, TransactionVerifier}; use anyhow::Context; +use gloo_utils::format::JsValueSerdeExt; use ledger::proofs::provers::BlockProver; use openmina_node_common::rpc::RpcSender; use wasm_bindgen::prelude::*; @@ -31,6 +32,11 @@ fn main() { }); } +#[wasm_bindgen] +pub fn build_env() -> JsValue { + JsValue::from_serde(&::node::BuildEnv::get()).unwrap_or_default() +} + #[wasm_bindgen] pub async fn run( block_producer: Option, From 68c40f3b6777d23fb8561bdca683570f3a0ac676 Mon Sep 17 00:00:00 2001 From: Adrian Nagy Date: Fri, 22 Nov 2024 11:33:27 +0100 Subject: [PATCH 093/175] fix: correct initialization of total slots per epoch --- node/src/action_kind.rs | 10 +++++++++- .../block_producer_vrf_evaluator_reducer.rs | 4 ++++ ...producer_vrf_evaluator_effectful_actions.rs | 1 + ...producer_vrf_evaluator_effectful_effects.rs | 16 ++++++++++++++++ node/src/stats/stats_block_producer.rs | 18 ++++++++++++++---- 5 files changed, 44 insertions(+), 5 deletions(-) diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 6ed3c79b7e..c9ee6f3fb3 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -156,6 +156,8 @@ pub enum ActionKind { BlockProducerVrfEvaluatorSelectInitialSlot, BlockProducerVrfEvaluatorWaitForNextEvaluation, BlockProducerVrfEvaluatorEffectfulEvaluateSlot, + BlockProducerVrfEvaluatorEffectfulInitializeStats, + BlockProducerVrfEvaluatorEffectfulSlotEvaluated, CheckTimeouts, ConsensusBestTipUpdate, ConsensusBlockChainProofUpdate, @@ -711,7 +713,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 595; + pub const COUNT: u16 = 597; } impl std::fmt::Display for ActionKind { @@ -1537,6 +1539,12 @@ impl ActionKindGet for BlockProducerVrfEvaluatorEffectfulAction { fn kind(&self) -> ActionKind { match self { Self::EvaluateSlot { .. } => ActionKind::BlockProducerVrfEvaluatorEffectfulEvaluateSlot, + Self::SlotEvaluated { .. } => { + ActionKind::BlockProducerVrfEvaluatorEffectfulSlotEvaluated + } + Self::InitializeStats { .. } => { + ActionKind::BlockProducerVrfEvaluatorEffectfulInitializeStats + } } } } diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs index dc0f21e238..2364e236f4 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs @@ -250,6 +250,10 @@ impl BlockProducerVrfEvaluatorState { let dispatcher = state_context.into_dispatcher(); dispatcher.push(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); + dispatcher.push(BlockProducerVrfEvaluatorEffectfulAction::InitializeStats { + epoch: *best_tip_epoch, + initial_slot: *best_tip_slot, + }); } BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction => { let BlockProducerVrfEvaluatorStatus::ReadyToEvaluate { diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs index ed5eeebf6c..199bc34f18 100644 --- a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_actions.rs @@ -6,6 +6,7 @@ use serde::{Deserialize, Serialize}; pub enum BlockProducerVrfEvaluatorEffectfulAction { EvaluateSlot { vrf_input: VrfEvaluatorInput }, SlotEvaluated { epoch: u32 }, + InitializeStats { epoch: u32, initial_slot: u32 }, } impl redux::EnablingCondition for BlockProducerVrfEvaluatorEffectfulAction { diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs index 09d7f62c23..099b523572 100644 --- a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs @@ -15,6 +15,22 @@ impl BlockProducerVrfEvaluatorEffectfulAction { stats.block_producer().increment_slot_evaluated(epoch); } } + BlockProducerVrfEvaluatorEffectfulAction::InitializeStats { + epoch, + initial_slot, + } => { + if let Some(stats) = store.service.stats() { + let slots_per_epoch = + store.state.get().config.consensus_constants.slots_per_epoch; + // We subtract 1 because the slots are indexed from 0 + let remaining_slots = slots_per_epoch + .saturating_sub(initial_slot) + .saturating_sub(1); + stats + .block_producer() + .new_epoch_evaluation(epoch, remaining_slots); + } + } } } } diff --git a/node/src/stats/stats_block_producer.rs b/node/src/stats/stats_block_producer.rs index bd01f4cf4a..35b945c68a 100644 --- a/node/src/stats/stats_block_producer.rs +++ b/node/src/stats/stats_block_producer.rs @@ -348,14 +348,24 @@ impl BlockProducerStats { } } + /// In case a new run, when the current epoch has less than `slots_per_epoch` slots to evaluate. + pub fn new_epoch_evaluation(&mut self, epoch: u32, remaining_slots: u32) { + self.vrf_evaluator.insert( + epoch, + VrfEvaluatorStats { + total_slots: remaining_slots, + evaluated_slots: 0, + }, + ); + } + pub fn increment_slot_evaluated(&mut self, epoch: u32) { self.vrf_evaluator .entry(epoch) .and_modify(|v| v.evaluated_slots = v.evaluated_slots.checked_add(1).expect("overflow")) - .or_insert_with(|| { - let mut stats = VrfEvaluatorStats::default(); - stats.evaluated_slots = 1; - stats + .or_insert_with(|| VrfEvaluatorStats { + evaluated_slots: 1, + ..Default::default() }); } } From 501b3ac22470cdafcaeff94c03581acca1ac44c0 Mon Sep 17 00:00:00 2001 From: Adrian Nagy Date: Fri, 22 Nov 2024 13:57:54 +0100 Subject: [PATCH 094/175] fix: correct initial slots --- .../block_producer_vrf_evaluator_actions.rs | 1 + .../block_producer_vrf_evaluator_reducer.rs | 24 ++++++++++++------- ...roducer_vrf_evaluator_effectful_effects.rs | 11 +++++---- node/src/stats/stats_block_producer.rs | 3 +-- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs index b5ed604638..0517c642b2 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs @@ -78,6 +78,7 @@ pub enum BlockProducerVrfEvaluatorAction { #[action_event(level = info, fields(current_global_slot, best_tip_height))] SelectInitialSlot { current_global_slot: u32, + current_slot: u32, best_tip_slot: u32, best_tip_global_slot: u32, best_tip_epoch: u32, diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs index 2364e236f4..51efbbf60d 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_reducer.rs @@ -250,10 +250,6 @@ impl BlockProducerVrfEvaluatorState { let dispatcher = state_context.into_dispatcher(); dispatcher.push(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); - dispatcher.push(BlockProducerVrfEvaluatorEffectfulAction::InitializeStats { - epoch: *best_tip_epoch, - initial_slot: *best_tip_slot, - }); } BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction => { let BlockProducerVrfEvaluatorStatus::ReadyToEvaluate { @@ -334,13 +330,15 @@ impl BlockProducerVrfEvaluatorState { let (dispatcher, state) = state_context.into_dispatcher_and_state(); let get_slot_and_status = || { let cur_global_slot = state.cur_global_slot()?; + let current_slot = state.current_slot()?; let status = &state.block_producer.vrf_evaluator()?.status; - Some((cur_global_slot, status)) + Some((cur_global_slot, current_slot, status)) }; let Some(( current_global_slot, + current_slot, BlockProducerVrfEvaluatorStatus::EpochDelegatorTableSuccess { best_tip_epoch, best_tip_slot, @@ -357,6 +355,7 @@ impl BlockProducerVrfEvaluatorState { dispatcher.push(BlockProducerVrfEvaluatorAction::SelectInitialSlot { current_global_slot, + current_slot, best_tip_epoch: *best_tip_epoch, best_tip_slot: *best_tip_slot, best_tip_global_slot: *best_tip_global_slot, @@ -433,26 +432,35 @@ impl BlockProducerVrfEvaluatorState { BlockProducerVrfEvaluatorAction::SelectInitialSlot { best_tip_epoch, current_global_slot, + current_slot, next_epoch_first_slot, best_tip_slot: current_best_tip_slot, best_tip_global_slot: current_best_tip_global_slot, staking_epoch_data, } => { - let (epoch_number, initial_slot) = match state.epoch_context() { - super::EpochContext::Current(_) => (*best_tip_epoch, *current_global_slot), + let (epoch_number, initial_global_slot, initial_slot) = match state.epoch_context() + { + super::EpochContext::Current(_) => { + (*best_tip_epoch, *current_global_slot, *current_slot) + } super::EpochContext::Next(_) => ( best_tip_epoch.checked_add(1).expect("overflow"), next_epoch_first_slot.checked_sub(1).expect("underflow"), + 0, ), super::EpochContext::Waiting => todo!(), }; state.status = BlockProducerVrfEvaluatorStatus::InitialSlotSelection { time: meta.time(), epoch_number, - initial_slot, + initial_slot: initial_global_slot, }; let (dispatcher, state) = state_context.into_dispatcher_and_state(); + dispatcher.push(BlockProducerVrfEvaluatorEffectfulAction::InitializeStats { + epoch: epoch_number, + initial_slot, + }); if let Some(initial_slot) = state .block_producer .vrf_evaluator() diff --git a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs index 099b523572..4f11f33b2f 100644 --- a/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs +++ b/node/src/block_producer_effectful/vrf_evaluator_effectful/block_producer_vrf_evaluator_effectful_effects.rs @@ -22,10 +22,13 @@ impl BlockProducerVrfEvaluatorEffectfulAction { if let Some(stats) = store.service.stats() { let slots_per_epoch = store.state.get().config.consensus_constants.slots_per_epoch; - // We subtract 1 because the slots are indexed from 0 - let remaining_slots = slots_per_epoch - .saturating_sub(initial_slot) - .saturating_sub(1); + // We add 1 because the evaluation starts from the next slot, except for the first slot 0 + let initial_slot = if initial_slot == 0 { + 0 + } else { + initial_slot.saturating_add(1) + }; + let remaining_slots = slots_per_epoch.saturating_sub(initial_slot); stats .block_producer() .new_epoch_evaluation(epoch, remaining_slots); diff --git a/node/src/stats/stats_block_producer.rs b/node/src/stats/stats_block_producer.rs index 35b945c68a..afdc28dc8a 100644 --- a/node/src/stats/stats_block_producer.rs +++ b/node/src/stats/stats_block_producer.rs @@ -91,7 +91,6 @@ pub struct ProducedBlockTransactions { pub zkapps: u16, } -// TODO(adonagy): distinguish between current and next epoch #[derive(Serialize, Deserialize, Debug, Clone)] pub struct VrfEvaluatorStats { pub total_slots: u32, @@ -101,7 +100,7 @@ pub struct VrfEvaluatorStats { impl Default for VrfEvaluatorStats { fn default() -> Self { Self { - total_slots: 7140, // TODO(adonagy): get this from constants + total_slots: 7140, evaluated_slots: 0, } } From e3099b4d0fc78b67db4e16843518c3e428958f92 Mon Sep 17 00:00:00 2001 From: Mimir Date: Fri, 22 Nov 2024 07:28:20 +0100 Subject: [PATCH 095/175] Review fixes --- node/src/action_kind.rs | 4 +- node/src/ledger/ledger_effects.rs | 536 ------------------ node/src/ledger/read/ledger_read_reducer.rs | 16 +- node/src/ledger/write/ledger_write_reducer.rs | 17 +- .../ledger_effectful_actions.rs | 1 - .../ledger_effectful_effects.rs | 12 +- 6 files changed, 21 insertions(+), 565 deletions(-) delete mode 100644 node/src/ledger/ledger_effects.rs diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index dae7b3517d..d7f52460f3 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -193,7 +193,6 @@ pub enum ActionKind { ExternalSnarkWorkerEffectfulSubmitWork, LedgerEffectfulReadInit, LedgerEffectfulWriteInit, - LedgerEffectfulWriteSuccess, LedgerReadFindTodos, LedgerReadInit, LedgerReadPending, @@ -715,7 +714,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 598; + pub const COUNT: u16 = 597; } impl std::fmt::Display for ActionKind { @@ -834,7 +833,6 @@ impl ActionKindGet for LedgerEffectfulAction { fn kind(&self) -> ActionKind { match self { Self::WriteInit { .. } => ActionKind::LedgerEffectfulWriteInit, - Self::WriteSuccess => ActionKind::LedgerEffectfulWriteSuccess, Self::ReadInit { .. } => ActionKind::LedgerEffectfulReadInit, } } diff --git a/node/src/ledger/ledger_effects.rs b/node/src/ledger/ledger_effects.rs deleted file mode 100644 index c4caf1ed47..0000000000 --- a/node/src/ledger/ledger_effects.rs +++ /dev/null @@ -1,536 +0,0 @@ -use mina_p2p_messages::v2; -use p2p::channels::rpc::P2pRpcRequest; -use p2p::channels::streaming_rpc::{P2pChannelsStreamingRpcAction, P2pStreamingRpcRequest}; -use p2p::P2pAction; - -use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorAction; -use crate::p2p::channels::rpc::{P2pChannelsRpcAction, P2pRpcId, P2pRpcResponse}; -use crate::p2p::PeerId; -use crate::transition_frontier::sync::ledger::staged::TransitionFrontierSyncLedgerStagedAction; -use crate::transition_frontier::sync::TransitionFrontierSyncAction; -use crate::{BlockProducerAction, RpcAction, Store}; - -use super::read::{ - LedgerReadAction, LedgerReadId, LedgerReadInitCallback, LedgerReadRequest, LedgerReadResponse, - LedgerReadStagedLedgerAuxAndPendingCoinbases, -}; -use super::write::{LedgerWriteAction, LedgerWriteResponse}; -use super::{LedgerAction, LedgerActionWithMeta, LedgerAddress, LedgerService}; - -pub fn ledger_effects(store: &mut Store, action: LedgerActionWithMeta) { - let (action, _) = action.split(); - - match action { - LedgerAction::Write(a) => match a { - LedgerWriteAction::Init { request, on_init } => { - store.service.write_init(request.clone()); - store.dispatch(LedgerWriteAction::Pending); - store.dispatch_callback(on_init, request); - } - LedgerWriteAction::Pending => {} - LedgerWriteAction::Success { response } => { - propagate_write_response(store, response); - next_write_request_init(store); - } - }, - LedgerAction::Read(a) => match a { - LedgerReadAction::FindTodos => { - next_read_requests_init(store); - } - LedgerReadAction::Init { request, callback } => { - if store.state().ledger.read.has_same_request(&request) { - return; - } - let id = store.state().ledger.read.next_req_id(); - store.service.read_init(id, request.clone()); - store.dispatch(LedgerReadAction::Pending { id, request }); - - match callback { - LedgerReadInitCallback::RpcLedgerAccountsGetPending { callback, args } => { - store.dispatch_callback(callback, args); - } - LedgerReadInitCallback::RpcScanStateSummaryGetPending { callback, args } => { - store.dispatch_callback(callback, args); - } - LedgerReadInitCallback::P2pChannelsResponsePending { callback, args } => { - store.dispatch_callback(callback, args); - } - LedgerReadInitCallback::None => {} - }; - } - LedgerReadAction::Pending { .. } => {} - LedgerReadAction::Success { id, response } => { - propagate_read_response(store, id, response); - store.dispatch(LedgerReadAction::Prune { id }); - } - LedgerReadAction::Prune { .. } => {} - }, - } -} - -fn next_write_request_init(store: &mut Store) { - if store.dispatch(BlockProducerAction::StagedLedgerDiffCreateInit) { - } else if store.dispatch(TransitionFrontierSyncAction::BlocksNextApplyInit) { - } else if store.dispatch(TransitionFrontierSyncAction::CommitInit) { - } else if store.dispatch(TransitionFrontierSyncLedgerStagedAction::ReconstructInit) { - } -} - -fn propagate_write_response( - store: &mut Store, - response: LedgerWriteResponse, -) { - let Some(request) = &store.state().ledger.write.request() else { - return; - }; - match (request, response) { - ( - _, - LedgerWriteResponse::StagedLedgerReconstruct { - staged_ledger_hash, - result, - }, - ) => { - let sync = &store.state().transition_frontier.sync; - let expected_ledger = sync - .ledger_target() - .and_then(|target| target.staged) - .map(|v| v.hashes.non_snark.ledger_hash); - if expected_ledger.as_ref() == Some(&staged_ledger_hash) { - match result { - Err(error) => { - store.dispatch( - TransitionFrontierSyncLedgerStagedAction::ReconstructError { error }, - ); - } - Ok(()) => { - store.dispatch( - TransitionFrontierSyncLedgerStagedAction::ReconstructSuccess { - ledger_hash: staged_ledger_hash, - }, - ); - } - } - } - } - ( - _, - LedgerWriteResponse::StagedLedgerDiffCreate { - pred_block_hash, - global_slot_since_genesis, - result, - }, - ) => { - let state = store.state.get(); - let Some((expected_pred_block_hash, expected_global_slot)) = None.or_else(|| { - let pred_block = state.block_producer.current_parent_chain()?.last()?; - let won_slot = state.block_producer.current_won_slot()?; - let slot = won_slot.global_slot_since_genesis(pred_block.global_slot_diff()); - Some((pred_block.hash(), slot)) - }) else { - return; - }; - - if &pred_block_hash == expected_pred_block_hash - && global_slot_since_genesis == expected_global_slot - { - match result { - Err(err) => todo!("handle staged ledger diff creation err: {err}"), - Ok(output) => { - store.dispatch(BlockProducerAction::StagedLedgerDiffCreateSuccess { - output, - }); - } - } - } - } - ( - _, - LedgerWriteResponse::BlockApply { - block_hash: hash, - result, - }, - ) => match result { - Err(error) => { - store.dispatch(TransitionFrontierSyncAction::BlocksNextApplyError { hash, error }); - } - Ok(result) => { - store.dispatch(TransitionFrontierSyncAction::BlocksNextApplySuccess { - hash, - just_emitted_a_proof: result.just_emitted_a_proof, - }); - } - }, - ( - _, - LedgerWriteResponse::Commit { - best_tip_hash, - result, - }, - ) => { - let best_tip = store.state().transition_frontier.sync.best_tip(); - if best_tip.map_or(false, |tip| tip.hash() == &best_tip_hash) { - store.dispatch(TransitionFrontierSyncAction::CommitSuccess { result }); - } - } - } -} - -fn next_read_requests_init(store: &mut Store) { - // fetching delegator table - store.dispatch(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); - - // p2p rpcs - let mut peers = store - .state() - .p2p - .ready_peers_iter() - .filter(|(_, peer)| { - peer.channels - .rpc - .remote_todo_requests_iter() - .next() - .is_some() - || peer.channels.streaming_rpc.remote_todo_request().is_some() - }) - .map(|(peer_id, peer)| (*peer_id, peer.channels.rpc_remote_last_responded())) - .collect::>(); - peers.sort_by_key(|(_, last_responded)| *last_responded); - for (peer_id, _) in peers { - let Some((id, request, is_streaming)) = None.or_else(|| { - let peer = store.state().p2p.ready()?.get_ready_peer(&peer_id)?; - let mut reqs = peer.channels.rpc.remote_todo_requests_iter(); - reqs.find_map(|req| { - let ledger_request = match &req.request { - P2pRpcRequest::LedgerQuery(hash, query) => match query { - v2::MinaLedgerSyncLedgerQueryStableV1::NumAccounts => { - LedgerReadRequest::GetNumAccounts(hash.clone()) - } - v2::MinaLedgerSyncLedgerQueryStableV1::WhatChildHashes(addr) => { - LedgerReadRequest::GetChildHashesAtAddr(hash.clone(), addr.into()) - } - v2::MinaLedgerSyncLedgerQueryStableV1::WhatContents(addr) => { - LedgerReadRequest::GetChildAccountsAtAddr(hash.clone(), addr.into()) - } - }, - P2pRpcRequest::StagedLedgerAuxAndPendingCoinbasesAtBlock(block_hash) => { - build_staged_ledger_parts_request(store.state(), block_hash)? - } - _ => return None, - }; - - Some((req.id, ledger_request, false)) - }) - .or_else(|| { - let (id, req) = peer.channels.streaming_rpc.remote_todo_request()?; - let ledger_request = match req { - P2pStreamingRpcRequest::StagedLedgerParts(block_hash) => { - build_staged_ledger_parts_request(store.state(), block_hash)? - } - }; - Some((id, ledger_request, true)) - }) - }) else { - continue; - }; - - store.dispatch(LedgerReadAction::Init { - request, - callback: LedgerReadInitCallback::P2pChannelsResponsePending - { callback: redux::callback!(on_ledger_read_init_p2p_channels_response_pending((is_streaming: bool, id: P2pRpcId, peer_id: PeerId)) -> crate::Action{ - if is_streaming { - P2pAction::from(P2pChannelsStreamingRpcAction::ResponsePending { - peer_id, - id, - }) - } else { - P2pAction::from(P2pChannelsRpcAction::ResponsePending { - peer_id, - id, - }) - } - }), - args:(is_streaming, id, peer_id) - } - }); - - if !store.state().ledger.read.is_total_cost_under_limit() { - return; - } - } - - // rpcs - let rpcs = store - .state() - .rpc - .scan_state_summary_rpc_ids() - .filter(|(.., status)| status.is_init()) - .map(|(id, ..)| id) - .collect::>(); - - for rpc_id in rpcs { - store.dispatch(RpcAction::ScanStateSummaryLedgerGetInit { rpc_id }); - if !store.state().ledger.read.is_total_cost_under_limit() { - return; - } - } - - let ledger_account_rpc = store - .state() - .rpc - .accounts_request_rpc_ids() - .filter(|(.., status)| status.is_init()) - .map(|(id, req, _)| (id, req)) - .collect::>(); - - for (rpc_id, req) in ledger_account_rpc { - store.dispatch(RpcAction::LedgerAccountsGetInit { - rpc_id, - account_query: req, - }); - if !store.state().ledger.read.is_total_cost_under_limit() { - return; - } - } -} - -fn build_staged_ledger_parts_request( - state: &crate::State, - block_hash: &v2::StateHash, -) -> Option { - let tf = &state.transition_frontier; - let ledger_hash = tf - .best_chain - .iter() - .find(|b| b.hash() == block_hash) - .map(|b| b.staged_ledger_hashes().clone())?; - let protocol_states = tf - .needed_protocol_states - .iter() - .map(|(hash, b)| (hash.clone(), b.clone())) - .chain( - tf.best_chain - .iter() - .take_while(|b| b.hash() != block_hash) - .map(|b| (b.hash().clone(), b.header().protocol_state.clone())), - ) - .collect(); - - Some(LedgerReadRequest::GetStagedLedgerAuxAndPendingCoinbases( - LedgerReadStagedLedgerAuxAndPendingCoinbases { - ledger_hash, - protocol_states, - }, - )) -} - -fn find_peers_with_ledger_rpc( - state: &crate::State, - req: &LedgerReadRequest, -) -> Vec<(PeerId, P2pRpcId, bool)> { - let Some(p2p) = state.p2p.ready() else { - return Vec::new(); - }; - p2p.ready_peers_iter() - .flat_map(|(peer_id, peer)| { - let rpcs = peer - .channels - .rpc - .remote_pending_requests_iter() - .map(move |req| (peer_id, req.id, &req.request)) - .filter(|(_, _, peer_req)| match (req, peer_req) { - ( - LedgerReadRequest::GetNumAccounts(h1), - P2pRpcRequest::LedgerQuery( - h2, - v2::MinaLedgerSyncLedgerQueryStableV1::NumAccounts, - ), - ) => h1 == h2, - ( - LedgerReadRequest::GetChildHashesAtAddr(h1, addr1), - P2pRpcRequest::LedgerQuery( - h2, - v2::MinaLedgerSyncLedgerQueryStableV1::WhatChildHashes(addr2), - ), - ) => h1 == h2 && addr1 == &LedgerAddress::from(addr2), - ( - LedgerReadRequest::GetChildAccountsAtAddr(h1, addr1), - P2pRpcRequest::LedgerQuery( - h2, - v2::MinaLedgerSyncLedgerQueryStableV1::WhatContents(addr2), - ), - ) => h1 == h2 && addr1 == &LedgerAddress::from(addr2), - ( - LedgerReadRequest::GetStagedLedgerAuxAndPendingCoinbases(data), - P2pRpcRequest::StagedLedgerAuxAndPendingCoinbasesAtBlock(block_hash), - ) => state - .transition_frontier - .get_state_body(block_hash) - .map_or(false, |b| { - b.blockchain_state.staged_ledger_hash == data.ledger_hash - }), - _ => false, - }) - .map(|(peer_id, rpc_id, _)| (*peer_id, rpc_id, false)); - let streaming_rpcs = peer - .channels - .streaming_rpc - .remote_pending_request() - .into_iter() - .filter(|(_, peer_req)| match (req, peer_req) { - ( - LedgerReadRequest::GetStagedLedgerAuxAndPendingCoinbases(data), - P2pStreamingRpcRequest::StagedLedgerParts(block_hash), - ) => state - .transition_frontier - .get_state_body(block_hash) - .map_or(false, |b| { - b.blockchain_state.staged_ledger_hash == data.ledger_hash - }), - _ => false, - }) - .map(|(rpc_id, _)| (*peer_id, rpc_id, true)); - rpcs.chain(streaming_rpcs) - }) - .collect() -} - -fn propagate_read_response( - store: &mut Store, - id: LedgerReadId, - response: LedgerReadResponse, -) { - let request = match store.state().ledger.read.get(id) { - None => return, - Some(v) => v.request(), - }; - match (request, response) { - ( - LedgerReadRequest::DelegatorTable(ledger_hash, pub_key), - LedgerReadResponse::DelegatorTable(table), - ) => { - let expected = store.state().block_producer.vrf_delegator_table_inputs(); - if !expected.map_or(false, |(expected_hash, producer)| { - ledger_hash == expected_hash && pub_key == producer - }) { - eprintln!("delegator table unexpected"); - return; - } - match table { - None => { - // TODO(tizoc): Revise this, may be better to dispatch a different action here - // and avoid running the VRF evaluator altogether when we know that the - // table is empty. - store.dispatch( - BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { - delegator_table: Default::default(), - }, - ); - } - Some(table) => { - store.dispatch( - BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { - delegator_table: table.into(), - }, - ); - } - } - } - (_, LedgerReadResponse::DelegatorTable(..)) => unreachable!(), - (req, LedgerReadResponse::GetNumAccounts(resp)) => { - for (peer_id, id, _) in find_peers_with_ledger_rpc(store.state(), req) { - store.dispatch(P2pChannelsRpcAction::ResponseSend { - peer_id, - id, - response: resp.as_ref().map(|(num_accounts, hash)| { - Box::new(P2pRpcResponse::LedgerQuery( - v2::MinaLedgerSyncLedgerAnswerStableV2::NumAccounts( - (*num_accounts).into(), - hash.clone(), - ), - )) - }), - }); - } - } - (req, LedgerReadResponse::GetChildHashesAtAddr(resp)) => { - for (peer_id, id, _) in find_peers_with_ledger_rpc(store.state(), req) { - store.dispatch(P2pChannelsRpcAction::ResponseSend { - peer_id, - id, - response: resp.as_ref().map(|(left, right)| { - Box::new(P2pRpcResponse::LedgerQuery( - v2::MinaLedgerSyncLedgerAnswerStableV2::ChildHashesAre( - left.clone(), - right.clone(), - ), - )) - }), - }); - } - } - (req, LedgerReadResponse::GetChildAccountsAtAddr(resp)) => { - for (peer_id, id, _) in find_peers_with_ledger_rpc(store.state(), req) { - store.dispatch(P2pChannelsRpcAction::ResponseSend { - peer_id, - id, - response: resp.as_ref().map(|accounts| { - Box::new(P2pRpcResponse::LedgerQuery( - v2::MinaLedgerSyncLedgerAnswerStableV2::ContentsAre( - accounts.iter().cloned().collect(), - ), - )) - }), - }); - } - } - (req, LedgerReadResponse::GetStagedLedgerAuxAndPendingCoinbases(resp)) => { - for (peer_id, id, is_streaming) in find_peers_with_ledger_rpc(store.state(), req) { - if is_streaming { - store.dispatch(P2pChannelsStreamingRpcAction::ResponseSendInit { - peer_id, - id, - response: resp.clone().map(Into::into), - }); - } else { - store.dispatch(P2pChannelsRpcAction::ResponseSend { - peer_id, - id, - response: resp.clone().map(|data| { - Box::new(P2pRpcResponse::StagedLedgerAuxAndPendingCoinbasesAtBlock( - data, - )) - }), - }); - } - } - } - ( - LedgerReadRequest::ScanStateSummary(ledger_hash), - LedgerReadResponse::ScanStateSummary(scan_state), - ) => { - for rpc_id in store - .state() - .rpc - .scan_state_summary_rpc_ids() - .filter(|(_, hash, _)| *hash == ledger_hash) - .map(|(id, ..)| id) - .collect::>() - { - store.dispatch(RpcAction::ScanStateSummaryGetSuccess { - rpc_id, - scan_state: scan_state.clone(), - }); - } - } - (_, LedgerReadResponse::ScanStateSummary(..)) => unreachable!(), - (_req, LedgerReadResponse::GetAccounts(..)) => todo!(), - (_, LedgerReadResponse::AccountsForRpc(rpc_id, accounts, account_query)) => { - store.dispatch(RpcAction::LedgerAccountsGetSuccess { - rpc_id, - accounts, - account_query, - }); - } - } -} diff --git a/node/src/ledger/read/ledger_read_reducer.rs b/node/src/ledger/read/ledger_read_reducer.rs index 31ebf8cf99..52b4c9720b 100644 --- a/node/src/ledger/read/ledger_read_reducer.rs +++ b/node/src/ledger/read/ledger_read_reducer.rs @@ -1,5 +1,5 @@ use mina_p2p_messages::v2; -use openmina_core::requests::RequestId; +use openmina_core::{bug_condition, requests::RequestId}; use p2p::{ channels::{ rpc::{P2pChannelsRpcAction, P2pRpcId, P2pRpcRequest, P2pRpcResponse}, @@ -23,7 +23,7 @@ use super::{ impl LedgerReadState { pub fn reducer(mut state_context: Substate, action: LedgerReadActionWithMetaRef<'_>) { let (action, meta) = action.split(); - let Ok(ledger_read_state) = state_context.get_substate_mut() else { + let Ok(state) = state_context.get_substate_mut() else { return; }; @@ -46,17 +46,17 @@ impl LedgerReadState { }); } LedgerReadAction::Pending { request, .. } => { - ledger_read_state.add(meta.time(), request.clone()); + state.add(meta.time(), request.clone()); } LedgerReadAction::Success { id, response } => { - ledger_read_state.add_response(*id, meta.time(), response.clone()); + state.add_response(*id, meta.time(), response.clone()); let (dispatcher, state) = state_context.into_dispatcher_and_state(); Self::propagate_read_response(dispatcher, state, *id, response.clone()); dispatcher.push(LedgerReadAction::Prune { id: *id }); } LedgerReadAction::Prune { id } => { - ledger_read_state.remove(*id); + state.remove(*id); } } } @@ -68,6 +68,7 @@ impl LedgerReadState { response: LedgerReadResponse, ) { let Some(request) = state.ledger.read.get(id) else { + bug_condition!("Request with id: {} not found", id); return; }; @@ -80,7 +81,7 @@ impl LedgerReadState { if !expected.map_or(false, |(expected_hash, producer)| { ledger_hash == expected_hash && pub_key == producer }) { - eprintln!("delegator table unexpected"); + bug_condition!("delegator table unexpected"); return; } match table { @@ -202,7 +203,8 @@ impl LedgerReadState { } fn next_read_requests_init(dispatcher: &mut Dispatcher, state: &State) { - // fetching delegator table + // fetching delegator table, this is required because delegator table construction requires reading from ledger. + // It could be that ledger read quota was reached when vrf tried to initiate that read, so we need to "retry" it if that's the case dispatcher.push(BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction); // p2p rpcs diff --git a/node/src/ledger/write/ledger_write_reducer.rs b/node/src/ledger/write/ledger_write_reducer.rs index d53599d35f..7333bdb041 100644 --- a/node/src/ledger/write/ledger_write_reducer.rs +++ b/node/src/ledger/write/ledger_write_reducer.rs @@ -15,13 +15,13 @@ use super::{ impl LedgerWriteState { pub fn reducer(mut state_context: Substate, action: LedgerWriteActionWithMetaRef<'_>) { let (action, meta) = action.split(); - let Ok(ledger_write_state) = state_context.get_substate_mut() else { + let Ok(state) = state_context.get_substate_mut() else { return; }; match action { LedgerWriteAction::Init { request, on_init } => { - *ledger_write_state = Self::Init { + *state = Self::Init { time: meta.time(), request: request.clone(), }; @@ -33,16 +33,16 @@ impl LedgerWriteState { }); } LedgerWriteAction::Pending => { - if let Self::Init { request, .. } = ledger_write_state { - *ledger_write_state = Self::Pending { + if let Self::Init { request, .. } = state { + *state = Self::Pending { time: meta.time(), request: request.clone(), }; } } LedgerWriteAction::Success { response } => { - if let Self::Pending { request, .. } = ledger_write_state { - *ledger_write_state = Self::Success { + if let Self::Pending { request, .. } = state { + *state = Self::Success { time: meta.time(), request: request.clone(), response: response.clone(), @@ -51,7 +51,10 @@ impl LedgerWriteState { let (dispatcher, state) = state_context.into_dispatcher_and_state(); Self::propagate_write_response(dispatcher, state, response.clone()); - dispatcher.push(LedgerEffectfulAction::WriteSuccess); + dispatcher.push(BlockProducerAction::StagedLedgerDiffCreateInit); + dispatcher.push(TransitionFrontierSyncAction::BlocksNextApplyInit); + dispatcher.push(TransitionFrontierSyncAction::CommitInit); + dispatcher.push(TransitionFrontierSyncLedgerStagedAction::ReconstructInit); } } } diff --git a/node/src/ledger_effectful/ledger_effectful_actions.rs b/node/src/ledger_effectful/ledger_effectful_actions.rs index 74731b91ce..548b518829 100644 --- a/node/src/ledger_effectful/ledger_effectful_actions.rs +++ b/node/src/ledger_effectful/ledger_effectful_actions.rs @@ -12,7 +12,6 @@ pub enum LedgerEffectfulAction { request: LedgerWriteRequest, on_init: Callback, }, - WriteSuccess, ReadInit { request: LedgerReadRequest, callback: LedgerReadInitCallback, diff --git a/node/src/ledger_effectful/ledger_effectful_effects.rs b/node/src/ledger_effectful/ledger_effectful_effects.rs index 06fbf99d24..ff3c20e831 100644 --- a/node/src/ledger_effectful/ledger_effectful_effects.rs +++ b/node/src/ledger_effectful/ledger_effectful_effects.rs @@ -6,10 +6,7 @@ use crate::{ write::LedgerWriteAction, LedgerService, }, - transition_frontier::sync::{ - ledger::staged::TransitionFrontierSyncLedgerStagedAction, TransitionFrontierSyncAction, - }, - BlockProducerAction, Store, + Store, }; use super::LedgerEffectfulAction; @@ -28,13 +25,6 @@ pub fn ledger_effectful_effects( store.dispatch(LedgerWriteAction::Pending); store.dispatch_callback(on_init, request); } - LedgerEffectfulAction::WriteSuccess => { - if store.dispatch(BlockProducerAction::StagedLedgerDiffCreateInit) { - } else if store.dispatch(TransitionFrontierSyncAction::BlocksNextApplyInit) { - } else if store.dispatch(TransitionFrontierSyncAction::CommitInit) { - } else if store.dispatch(TransitionFrontierSyncLedgerStagedAction::ReconstructInit) { - } - } LedgerEffectfulAction::ReadInit { request, callback, From 771b59350ae2f896278ad1353fee83b6dc902289 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Fri, 22 Nov 2024 17:41:44 +0400 Subject: [PATCH 096/175] refactor(transaction_pool): tidy up state machine by extracting different parts to different files --- node/src/transaction_pool/mod.rs | 480 +----------------- .../transaction_pool_actions.rs | 52 -- .../transaction_pool_effects.rs | 56 ++ .../transaction_pool_reducer.rs | 341 +++++++++++++ .../transaction_pool_service.rs | 16 + .../transaction_pool_state.rs | 127 +++++ 6 files changed, 548 insertions(+), 524 deletions(-) create mode 100644 node/src/transaction_pool/transaction_pool_effects.rs create mode 100644 node/src/transaction_pool/transaction_pool_reducer.rs create mode 100644 node/src/transaction_pool/transaction_pool_service.rs create mode 100644 node/src/transaction_pool/transaction_pool_state.rs diff --git a/node/src/transaction_pool/mod.rs b/node/src/transaction_pool/mod.rs index 4f4ddfc220..79c0a01a16 100644 --- a/node/src/transaction_pool/mod.rs +++ b/node/src/transaction_pool/mod.rs @@ -1,476 +1,12 @@ -use ledger::{ - scan_state::{ - currency::{Amount, Nonce, Slot}, - transaction_logic::{verifiable, UserCommand, WithStatus}, - }, - transaction_pool::{ - diff::{self, DiffVerified}, - transaction_hash, ApplyDecision, Config, TransactionPoolErrors, ValidCommandWithHash, - }, - Account, AccountId, -}; -use mina_p2p_messages::v2; -use openmina_core::{ - bug_condition, consensus::ConsensusConstants, constants::constraint_constants, requests::RpcId, -}; -use p2p::channels::transaction::P2pChannelsTransactionAction; -use redux::callback; -use snark::{user_command_verify::SnarkUserCommandVerifyId, TransactionVerifier, VerifierSRS}; -use std::{ - collections::{BTreeMap, BTreeSet, HashMap}, - sync::Arc, -}; -use transaction_pool_actions::TransactionPoolActionWithMetaRef; +mod transaction_pool_state; +pub use transaction_pool_state::*; -pub mod transaction_pool_actions; +mod transaction_pool_actions; +pub use transaction_pool_actions::*; -pub use transaction_pool_actions::{TransactionPoolAction, TransactionPoolEffectfulAction}; +mod transaction_pool_reducer; -use crate::{BlockProducerAction, RpcAction}; +mod transaction_pool_effects; -type PendingId = u32; - -#[derive(Debug, serde::Serialize, serde::Deserialize)] -pub struct TransactionPoolState { - pool: ledger::transaction_pool::TransactionPool, - pending_actions: BTreeMap, - pending_id: PendingId, - best_tip_hash: Option, - /// For debug only - #[serde(skip)] - file: Option, -} - -impl Clone for TransactionPoolState { - fn clone(&self) -> Self { - Self { - pool: self.pool.clone(), - pending_actions: self.pending_actions.clone(), - pending_id: self.pending_id, - best_tip_hash: self.best_tip_hash.clone(), - file: None, - } - } -} - -impl TransactionPoolState { - pub fn new(config: Config, consensus_constants: &ConsensusConstants) -> Self { - Self { - pool: ledger::transaction_pool::TransactionPool::new(config, consensus_constants), - pending_actions: Default::default(), - pending_id: 0, - best_tip_hash: None, - file: None, - } - } - - pub fn size(&self) -> usize { - self.pool.size() - } - - pub fn transactions(&mut self, limit: usize) -> Vec { - self.pool.transactions(limit) - } - - pub fn list_includable_transactions(&self, limit: usize) -> Vec { - self.pool.list_includable_transactions(limit) - } - - pub fn get_all_transactions(&self) -> Vec { - self.pool.get_all_transactions() - } - - pub fn get_pending_amount_and_nonce(&self) -> HashMap, Amount)> { - self.pool.get_pending_amount_and_nonce() - } - - fn next_pending_id(&mut self) -> PendingId { - let id = self.pending_id; - self.pending_id = self.pending_id.wrapping_add(1); - id - } - - fn make_action_pending(&mut self, action: &TransactionPoolAction) -> PendingId { - let id = self.next_pending_id(); - self.pending_actions.insert(id, action.clone()); - id - } - - #[allow(dead_code)] - fn save_actions(state: &mut crate::Substate) { - let substate = state.get_substate_mut().unwrap(); - if substate.file.is_none() { - let mut file = std::fs::File::create("/tmp/pool.bin").unwrap(); - postcard::to_io(&state.unsafe_get_state(), &mut file).unwrap(); - let substate = state.get_substate_mut().unwrap(); - substate.file = Some(file); - } - } - - pub fn reducer(mut state: crate::Substate, action: TransactionPoolActionWithMetaRef<'_>) { - // Uncoment following line to save actions to `/tmp/pool.bin` - // Self::save_actions(&mut state); - - let substate = state.get_substate_mut().unwrap(); - if let Some(file) = substate.file.as_mut() { - postcard::to_io(&action, file).unwrap(); - }; - - Self::handle_action(state, action) - } - - fn global_slots(state: &crate::State) -> Option<(Slot, Slot)> { - Some(( - Slot::from_u32(state.cur_global_slot()?), - Slot::from_u32(state.cur_global_slot_since_genesis()?), - )) - } - - fn handle_action( - mut state: crate::Substate, - action: TransactionPoolActionWithMetaRef<'_>, - ) { - let (action, meta) = action.split(); - let Some((global_slot, global_slot_from_genesis)) = - // TODO: remove usage of `unsafe_get_state` - Self::global_slots(state.unsafe_get_state()) - else { - return; - }; - let substate = state.get_substate_mut().unwrap(); - - match action { - TransactionPoolAction::StartVerify { commands, from_rpc } => { - let Ok(commands) = commands - .iter() - .map(UserCommand::try_from) - .collect::, _>>() - else { - // ignore all commands if one is invalid - return; - }; - - let account_ids = commands - .iter() - .flat_map(UserCommand::accounts_referenced) - .collect::>(); - let best_tip_hash = substate.best_tip_hash.clone().unwrap(); - let pending_id = substate.make_action_pending(action); - - let dispatcher = state.into_dispatcher(); - dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { - account_ids, - ledger_hash: best_tip_hash.clone(), - on_result: callback!(fetch_to_verify((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { - TransactionPoolAction::StartVerifyWithAccounts { accounts, pending_id: id.unwrap(), from_rpc } - }), - pending_id: Some(pending_id), - from_rpc: *from_rpc, - }); - } - TransactionPoolAction::StartVerifyWithAccounts { - accounts, - pending_id, - from_rpc, - } => { - let TransactionPoolAction::StartVerify { commands, .. } = - substate.pending_actions.remove(pending_id).unwrap() - else { - panic!() - }; - - // TODO: Convert those commands only once - let Ok(commands) = commands - .iter() - .map(UserCommand::try_from) - .collect::, _>>() - else { - return; - }; - let diff = diff::Diff { list: commands }; - - match substate.pool.verify(diff, accounts) { - Ok(valids) => { - let valids = valids - .into_iter() - .map(transaction_hash::hash_command) - .collect::>(); - let best_tip_hash = substate.best_tip_hash.clone().unwrap(); - let diff = DiffVerified { list: valids }; - - let dispatcher = state.into_dispatcher(); - dispatcher.push(TransactionPoolAction::ApplyVerifiedDiff { - best_tip_hash, - diff, - is_sender_local: from_rpc.is_some(), - from_rpc: *from_rpc, - }); - } - Err(e) => { - let dispatch_errors = |errors: Vec| { - let dispatcher = state.into_dispatcher(); - dispatcher.push(TransactionPoolAction::VerifyError { - errors: errors.clone(), - }); - if let Some(rpc_id) = from_rpc { - dispatcher.push(RpcAction::TransactionInjectFailure { - rpc_id: *rpc_id, - errors, - }) - } - }; - match e { - TransactionPoolErrors::BatchedErrors(errors) => { - let errors: Vec<_> = - errors.into_iter().map(|e| e.to_string()).collect(); - dispatch_errors(errors); - } - TransactionPoolErrors::LoadingVK(error) => dispatch_errors(vec![error]), - TransactionPoolErrors::Unexpected(es) => { - panic!("{es}") - } - } - } - } - } - TransactionPoolAction::VerifyError { .. } => { - // just logging the errors - } - TransactionPoolAction::BestTipChanged { best_tip_hash } => { - let account_ids = substate.pool.get_accounts_to_revalidate_on_new_best_tip(); - substate.best_tip_hash = Some(best_tip_hash.clone()); - - let dispatcher = state.into_dispatcher(); - dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { - account_ids, - ledger_hash: best_tip_hash.clone(), - on_result: callback!(fetch_for_best_tip((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { - TransactionPoolAction::BestTipChangedWithAccounts { accounts } - }), - pending_id: None, - from_rpc: None, - }); - } - TransactionPoolAction::BestTipChangedWithAccounts { accounts } => { - if let Err(e) = substate - .pool - .on_new_best_tip(global_slot_from_genesis, accounts) - { - bug_condition!("transaction pool::on_new_best_tip failed: {:?}", e); - } - } - TransactionPoolAction::ApplyVerifiedDiff { - best_tip_hash, - diff, - is_sender_local: _, - from_rpc, - } => { - let account_ids = substate.pool.get_accounts_to_apply_diff(diff); - let pending_id = substate.make_action_pending(action); - - let dispatcher = state.into_dispatcher(); - dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { - account_ids, - ledger_hash: best_tip_hash.clone(), - on_result: callback!(fetch_for_apply((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { - TransactionPoolAction::ApplyVerifiedDiffWithAccounts { - accounts, - pending_id: id.unwrap(), - } - }), - pending_id: Some(pending_id), - from_rpc: *from_rpc, - }); - } - TransactionPoolAction::ApplyVerifiedDiffWithAccounts { - accounts, - pending_id, - } => { - let TransactionPoolAction::ApplyVerifiedDiff { - best_tip_hash: _, - diff, - is_sender_local, - from_rpc, - } = substate.pending_actions.remove(pending_id).unwrap() - else { - panic!() - }; - - // Note(adonagy): Action for rebroadcast, in his action we can use forget_check - match substate.pool.unsafe_apply( - meta.time(), - global_slot_from_genesis, - global_slot, - &diff, - accounts, - is_sender_local, - ) { - Ok((ApplyDecision::Accept, accepted, rejected)) => { - if let Some(rpc_id) = from_rpc { - let dispatcher = state.into_dispatcher(); - - dispatcher.push(RpcAction::TransactionInjectSuccess { - rpc_id, - response: accepted.clone(), - }); - dispatcher - .push(TransactionPoolAction::Rebroadcast { accepted, rejected }); - } - } - Ok((ApplyDecision::Reject, accepted, rejected)) => { - if let Some(rpc_id) = from_rpc { - let dispatcher = state.into_dispatcher(); - - dispatcher.push(RpcAction::TransactionInjectRejected { - rpc_id, - response: rejected.clone(), - }); - dispatcher - .push(TransactionPoolAction::Rebroadcast { accepted, rejected }); - } - } - Err(e) => eprintln!("unsafe_apply error: {:?}", e), - } - } - TransactionPoolAction::ApplyTransitionFrontierDiff { - best_tip_hash, - diff, - } => { - assert_eq!(substate.best_tip_hash.as_ref().unwrap(), best_tip_hash); - - let (account_ids, uncommitted) = - substate.pool.get_accounts_to_handle_transition_diff(diff); - let pending_id = substate.make_action_pending(action); - - let dispatcher = state.into_dispatcher(); - dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { - account_ids: account_ids.union(&uncommitted).cloned().collect(), - ledger_hash: best_tip_hash.clone(), - on_result: callback!(fetch_for_diff((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { - TransactionPoolAction::ApplyTransitionFrontierDiffWithAccounts { - accounts, - pending_id: id.unwrap(), - } - }), - pending_id: Some(pending_id), - from_rpc: None, - }); - } - TransactionPoolAction::ApplyTransitionFrontierDiffWithAccounts { - accounts, - pending_id, - } => { - let TransactionPoolAction::ApplyTransitionFrontierDiff { - best_tip_hash: _, - diff, - } = substate.pending_actions.remove(pending_id).unwrap() - else { - panic!() - }; - - let collect = |set: &BTreeSet| { - set.iter() - .filter_map(|id| { - let account = accounts.get(id).cloned()?; - Some((id.clone(), account)) - }) - .collect::>() - }; - - let (account_ids, uncommitted) = - substate.pool.get_accounts_to_handle_transition_diff(&diff); - - let in_cmds = collect(&account_ids); - let uncommitted = collect(&uncommitted); - - if let Err(e) = substate.pool.handle_transition_frontier_diff( - global_slot_from_genesis, - global_slot, - &diff, - &account_ids, - &in_cmds, - &uncommitted, - ) { - bug_condition!( - "transaction pool::handle_transition_frontier_diff failed: {:?}", - e - ); - } - } - TransactionPoolAction::Rebroadcast { accepted, rejected } => { - let rejected = rejected.iter().map(|(cmd, _)| cmd.data.forget_check()); - - let all_commands = accepted - .iter() - .map(|cmd| cmd.data.forget_check()) - .chain(rejected) - .collect::>(); - - let dispatcher = state.into_dispatcher(); - - for cmd in all_commands { - dispatcher.push(P2pChannelsTransactionAction::Libp2pBroadcast { - transaction: Box::new((&cmd).into()), - nonce: 0, - }); - } - } - TransactionPoolAction::CollectTransactionsByFee => { - let transaction_capacity = - 2u64.pow(constraint_constants().transaction_capacity_log_2 as u32); - let transactions_by_fee = substate - .pool - .list_includable_transactions(transaction_capacity as usize) - .into_iter() - .map(|cmd| cmd.data) - .collect::>(); - - let dispatcher = state.into_dispatcher(); - - dispatcher.push(BlockProducerAction::WonSlotTransactionsSuccess { - transactions_by_fee, - }); - } - } - } -} - -pub trait VerifyUserCommandsService: redux::Service { - fn verify_init( - &mut self, - req_id: SnarkUserCommandVerifyId, - commands: Vec>, - verifier_index: TransactionVerifier, - verifier_srs: Arc, - ); -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::State; - use redux::Dispatcher; - use transaction_pool_actions::TransactionPoolActionWithMeta; - - #[allow(unused)] - #[test] - fn test_replay_pool() { - let vec = std::fs::read("/tmp/pool.bin").unwrap(); - let slice = vec.as_slice(); - - let (mut state, rest) = postcard::take_from_bytes::(slice).unwrap(); - let mut slice = rest; - - while let Ok((action, rest)) = - postcard::take_from_bytes::(slice) - { - slice = rest; - - let mut dispatcher = Dispatcher::new(); - let state = crate::Substate::::new(&mut state, &mut dispatcher); - let (action, meta) = action.split(); - - TransactionPoolState::handle_action(state, meta.with_action(&action)); - } - } -} +mod transaction_pool_service; +pub use transaction_pool_service::*; diff --git a/node/src/transaction_pool/transaction_pool_actions.rs b/node/src/transaction_pool/transaction_pool_actions.rs index 0bffbbd799..4ce4875b71 100644 --- a/node/src/transaction_pool/transaction_pool_actions.rs +++ b/node/src/transaction_pool/transaction_pool_actions.rs @@ -15,8 +15,6 @@ use openmina_core::{requests::RpcId, ActionEvent}; use redux::Callback; use serde::{Deserialize, Serialize}; -use crate::ledger::LedgerService; - use super::PendingId; pub type TransactionPoolActionWithMeta = redux::ActionWithMeta; @@ -92,53 +90,3 @@ pub enum TransactionPoolEffectfulAction { } impl redux::EnablingCondition for TransactionPoolEffectfulAction {} - -impl TransactionPoolEffectfulAction { - pub fn effects(self, store: &mut Store) - where - Store: snark::SnarkStore, - Store::Service: LedgerService, - { - match self { - TransactionPoolEffectfulAction::FetchAccounts { - account_ids, - ledger_hash, - on_result, - pending_id, - from_rpc, - } => { - openmina_core::log::info!( - openmina_core::log::system_time(); - kind = "TransactionPoolEffectfulFetchAccounts", - summary = "fetching accounts for tx pool"); - // FIXME: the ledger ctx `get_accounts` function doesn't ensure that every account we - // asked for is included in the result. - // TODO: should be asynchronous. Once asynchronous, watch out for race - // conditions between tx pool and transition frontier. By the time the - // accounts have been fetched the best tip may have changed already. - let accounts = match store - .service() - .ledger_manager() - .get_accounts(&ledger_hash, account_ids.iter().cloned().collect()) - { - Ok(accounts) => accounts, - Err(err) => { - openmina_core::log::error!( - openmina_core::log::system_time(); - kind = "Error", - summary = "failed to fetch accounts for tx pool", - error = format!("ledger {:?}, error: {:?}", ledger_hash, err)); - return; - } - }; - - let accounts = accounts - .into_iter() - .map(|account| (account.id(), account)) - .collect::>(); - - store.dispatch_callback(on_result, (accounts, pending_id, from_rpc)); - } - } - } -} diff --git a/node/src/transaction_pool/transaction_pool_effects.rs b/node/src/transaction_pool/transaction_pool_effects.rs new file mode 100644 index 0000000000..f508b140b6 --- /dev/null +++ b/node/src/transaction_pool/transaction_pool_effects.rs @@ -0,0 +1,56 @@ +use std::collections::BTreeMap; + +use crate::ledger::LedgerService; +use crate::snark::SnarkStore; + +use super::TransactionPoolEffectfulAction; + +impl TransactionPoolEffectfulAction { + pub fn effects(self, store: &mut Store) + where + Store: SnarkStore, + Store::Service: LedgerService, + { + match self { + TransactionPoolEffectfulAction::FetchAccounts { + account_ids, + ledger_hash, + on_result, + pending_id, + from_rpc, + } => { + openmina_core::log::info!( + openmina_core::log::system_time(); + kind = "TransactionPoolEffectfulFetchAccounts", + summary = "fetching accounts for tx pool"); + // FIXME: the ledger ctx `get_accounts` function doesn't ensure that every account we + // asked for is included in the result. + // TODO: should be asynchronous. Once asynchronous, watch out for race + // conditions between tx pool and transition frontier. By the time the + // accounts have been fetched the best tip may have changed already. + let accounts = match store + .service() + .ledger_manager() + .get_accounts(&ledger_hash, account_ids.iter().cloned().collect()) + { + Ok(accounts) => accounts, + Err(err) => { + openmina_core::log::error!( + openmina_core::log::system_time(); + kind = "Error", + summary = "failed to fetch accounts for tx pool", + error = format!("ledger {:?}, error: {:?}", ledger_hash, err)); + return; + } + }; + + let accounts = accounts + .into_iter() + .map(|account| (account.id(), account)) + .collect::>(); + + store.dispatch_callback(on_result, (accounts, pending_id, from_rpc)); + } + } + } +} diff --git a/node/src/transaction_pool/transaction_pool_reducer.rs b/node/src/transaction_pool/transaction_pool_reducer.rs new file mode 100644 index 0000000000..6c7b92d17e --- /dev/null +++ b/node/src/transaction_pool/transaction_pool_reducer.rs @@ -0,0 +1,341 @@ +use ledger::{ + scan_state::transaction_logic::UserCommand, + transaction_pool::{ + diff::{self, DiffVerified}, + transaction_hash, ApplyDecision, TransactionPoolErrors, + }, + Account, AccountId, +}; +use openmina_core::{bug_condition, constants::constraint_constants, requests::RpcId}; +use p2p::channels::transaction::P2pChannelsTransactionAction; +use redux::callback; +use std::collections::{BTreeMap, BTreeSet}; + +use crate::{BlockProducerAction, RpcAction}; + +use super::{ + PendingId, TransactionPoolAction, TransactionPoolActionWithMetaRef, + TransactionPoolEffectfulAction, TransactionPoolState, +}; + +impl TransactionPoolState { + pub fn reducer(mut state: crate::Substate, action: TransactionPoolActionWithMetaRef<'_>) { + // Uncoment following line to save actions to `/tmp/pool.bin` + // Self::save_actions(&mut state); + + let substate = state.get_substate_mut().unwrap(); + if let Some(file) = substate.file.as_mut() { + postcard::to_io(&action, file).unwrap(); + }; + + Self::handle_action(state, action) + } + + pub(super) fn handle_action( + mut state: crate::Substate, + action: TransactionPoolActionWithMetaRef<'_>, + ) { + let (action, meta) = action.split(); + let Some((global_slot, global_slot_from_genesis)) = + // TODO: remove usage of `unsafe_get_state` + Self::global_slots(state.unsafe_get_state()) + else { + return; + }; + let substate = state.get_substate_mut().unwrap(); + + match action { + TransactionPoolAction::StartVerify { commands, from_rpc } => { + let Ok(commands) = commands + .iter() + .map(UserCommand::try_from) + .collect::, _>>() + else { + // ignore all commands if one is invalid + return; + }; + + let account_ids = commands + .iter() + .flat_map(UserCommand::accounts_referenced) + .collect::>(); + let best_tip_hash = substate.best_tip_hash.clone().unwrap(); + let pending_id = substate.make_action_pending(action); + + let dispatcher = state.into_dispatcher(); + dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { + account_ids, + ledger_hash: best_tip_hash.clone(), + on_result: callback!(fetch_to_verify((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { + TransactionPoolAction::StartVerifyWithAccounts { accounts, pending_id: id.unwrap(), from_rpc } + }), + pending_id: Some(pending_id), + from_rpc: *from_rpc, + }); + } + TransactionPoolAction::StartVerifyWithAccounts { + accounts, + pending_id, + from_rpc, + } => { + let TransactionPoolAction::StartVerify { commands, .. } = + substate.pending_actions.remove(pending_id).unwrap() + else { + panic!() + }; + + // TODO: Convert those commands only once + let Ok(commands) = commands + .iter() + .map(UserCommand::try_from) + .collect::, _>>() + else { + return; + }; + let diff = diff::Diff { list: commands }; + + match substate.pool.verify(diff, accounts) { + Ok(valids) => { + let valids = valids + .into_iter() + .map(transaction_hash::hash_command) + .collect::>(); + let best_tip_hash = substate.best_tip_hash.clone().unwrap(); + let diff = DiffVerified { list: valids }; + + let dispatcher = state.into_dispatcher(); + dispatcher.push(TransactionPoolAction::ApplyVerifiedDiff { + best_tip_hash, + diff, + is_sender_local: from_rpc.is_some(), + from_rpc: *from_rpc, + }); + } + Err(e) => { + let dispatch_errors = |errors: Vec| { + let dispatcher = state.into_dispatcher(); + dispatcher.push(TransactionPoolAction::VerifyError { + errors: errors.clone(), + }); + if let Some(rpc_id) = from_rpc { + dispatcher.push(RpcAction::TransactionInjectFailure { + rpc_id: *rpc_id, + errors, + }) + } + }; + match e { + TransactionPoolErrors::BatchedErrors(errors) => { + let errors: Vec<_> = + errors.into_iter().map(|e| e.to_string()).collect(); + dispatch_errors(errors); + } + TransactionPoolErrors::LoadingVK(error) => dispatch_errors(vec![error]), + TransactionPoolErrors::Unexpected(es) => { + panic!("{es}") + } + } + } + } + } + TransactionPoolAction::VerifyError { .. } => { + // just logging the errors + } + TransactionPoolAction::BestTipChanged { best_tip_hash } => { + let account_ids = substate.pool.get_accounts_to_revalidate_on_new_best_tip(); + substate.best_tip_hash = Some(best_tip_hash.clone()); + + let dispatcher = state.into_dispatcher(); + dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { + account_ids, + ledger_hash: best_tip_hash.clone(), + on_result: callback!(fetch_for_best_tip((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { + TransactionPoolAction::BestTipChangedWithAccounts { accounts } + }), + pending_id: None, + from_rpc: None, + }); + } + TransactionPoolAction::BestTipChangedWithAccounts { accounts } => { + if let Err(e) = substate + .pool + .on_new_best_tip(global_slot_from_genesis, accounts) + { + bug_condition!("transaction pool::on_new_best_tip failed: {:?}", e); + } + } + TransactionPoolAction::ApplyVerifiedDiff { + best_tip_hash, + diff, + is_sender_local: _, + from_rpc, + } => { + let account_ids = substate.pool.get_accounts_to_apply_diff(diff); + let pending_id = substate.make_action_pending(action); + + let dispatcher = state.into_dispatcher(); + dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { + account_ids, + ledger_hash: best_tip_hash.clone(), + on_result: callback!(fetch_for_apply((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { + TransactionPoolAction::ApplyVerifiedDiffWithAccounts { + accounts, + pending_id: id.unwrap(), + } + }), + pending_id: Some(pending_id), + from_rpc: *from_rpc, + }); + } + TransactionPoolAction::ApplyVerifiedDiffWithAccounts { + accounts, + pending_id, + } => { + let TransactionPoolAction::ApplyVerifiedDiff { + best_tip_hash: _, + diff, + is_sender_local, + from_rpc, + } = substate.pending_actions.remove(pending_id).unwrap() + else { + panic!() + }; + + // Note(adonagy): Action for rebroadcast, in his action we can use forget_check + match substate.pool.unsafe_apply( + meta.time(), + global_slot_from_genesis, + global_slot, + &diff, + accounts, + is_sender_local, + ) { + Ok((ApplyDecision::Accept, accepted, rejected)) => { + if let Some(rpc_id) = from_rpc { + let dispatcher = state.into_dispatcher(); + + dispatcher.push(RpcAction::TransactionInjectSuccess { + rpc_id, + response: accepted.clone(), + }); + dispatcher + .push(TransactionPoolAction::Rebroadcast { accepted, rejected }); + } + } + Ok((ApplyDecision::Reject, accepted, rejected)) => { + if let Some(rpc_id) = from_rpc { + let dispatcher = state.into_dispatcher(); + + dispatcher.push(RpcAction::TransactionInjectRejected { + rpc_id, + response: rejected.clone(), + }); + dispatcher + .push(TransactionPoolAction::Rebroadcast { accepted, rejected }); + } + } + Err(e) => eprintln!("unsafe_apply error: {:?}", e), + } + } + TransactionPoolAction::ApplyTransitionFrontierDiff { + best_tip_hash, + diff, + } => { + assert_eq!(substate.best_tip_hash.as_ref().unwrap(), best_tip_hash); + + let (account_ids, uncommitted) = + substate.pool.get_accounts_to_handle_transition_diff(diff); + let pending_id = substate.make_action_pending(action); + + let dispatcher = state.into_dispatcher(); + dispatcher.push(TransactionPoolEffectfulAction::FetchAccounts { + account_ids: account_ids.union(&uncommitted).cloned().collect(), + ledger_hash: best_tip_hash.clone(), + on_result: callback!(fetch_for_diff((accounts: BTreeMap, id: Option, from_rpc: Option)) -> crate::Action { + TransactionPoolAction::ApplyTransitionFrontierDiffWithAccounts { + accounts, + pending_id: id.unwrap(), + } + }), + pending_id: Some(pending_id), + from_rpc: None, + }); + } + TransactionPoolAction::ApplyTransitionFrontierDiffWithAccounts { + accounts, + pending_id, + } => { + let TransactionPoolAction::ApplyTransitionFrontierDiff { + best_tip_hash: _, + diff, + } = substate.pending_actions.remove(pending_id).unwrap() + else { + panic!() + }; + + let collect = |set: &BTreeSet| { + set.iter() + .filter_map(|id| { + let account = accounts.get(id).cloned()?; + Some((id.clone(), account)) + }) + .collect::>() + }; + + let (account_ids, uncommitted) = + substate.pool.get_accounts_to_handle_transition_diff(&diff); + + let in_cmds = collect(&account_ids); + let uncommitted = collect(&uncommitted); + + if let Err(e) = substate.pool.handle_transition_frontier_diff( + global_slot_from_genesis, + global_slot, + &diff, + &account_ids, + &in_cmds, + &uncommitted, + ) { + bug_condition!( + "transaction pool::handle_transition_frontier_diff failed: {:?}", + e + ); + } + } + TransactionPoolAction::Rebroadcast { accepted, rejected } => { + let rejected = rejected.iter().map(|(cmd, _)| cmd.data.forget_check()); + + let all_commands = accepted + .iter() + .map(|cmd| cmd.data.forget_check()) + .chain(rejected) + .collect::>(); + + let dispatcher = state.into_dispatcher(); + + for cmd in all_commands { + dispatcher.push(P2pChannelsTransactionAction::Libp2pBroadcast { + transaction: Box::new((&cmd).into()), + nonce: 0, + }); + } + } + TransactionPoolAction::CollectTransactionsByFee => { + let transaction_capacity = + 2u64.pow(constraint_constants().transaction_capacity_log_2 as u32); + let transactions_by_fee = substate + .pool + .list_includable_transactions(transaction_capacity as usize) + .into_iter() + .map(|cmd| cmd.data) + .collect::>(); + + let dispatcher = state.into_dispatcher(); + + dispatcher.push(BlockProducerAction::WonSlotTransactionsSuccess { + transactions_by_fee, + }); + } + } + } +} diff --git a/node/src/transaction_pool/transaction_pool_service.rs b/node/src/transaction_pool/transaction_pool_service.rs new file mode 100644 index 0000000000..c4721cfe29 --- /dev/null +++ b/node/src/transaction_pool/transaction_pool_service.rs @@ -0,0 +1,16 @@ +use std::sync::Arc; + +use crate::snark::{ + user_command_verify::SnarkUserCommandVerifyId, TransactionVerifier, VerifierSRS, +}; +use ledger::scan_state::transaction_logic::{verifiable, WithStatus}; + +pub trait VerifyUserCommandsService: redux::Service { + fn verify_init( + &mut self, + req_id: SnarkUserCommandVerifyId, + commands: Vec>, + verifier_index: TransactionVerifier, + verifier_srs: Arc, + ); +} diff --git a/node/src/transaction_pool/transaction_pool_state.rs b/node/src/transaction_pool/transaction_pool_state.rs new file mode 100644 index 0000000000..2ea3ec7b1c --- /dev/null +++ b/node/src/transaction_pool/transaction_pool_state.rs @@ -0,0 +1,127 @@ +use ledger::{ + scan_state::currency::{Amount, Nonce, Slot}, + transaction_pool::{Config, ValidCommandWithHash}, + AccountId, +}; +use mina_p2p_messages::v2; +use openmina_core::consensus::ConsensusConstants; +use std::collections::{BTreeMap, HashMap}; + +use super::TransactionPoolAction; + +pub(super) type PendingId = u32; + +#[derive(Debug, serde::Serialize, serde::Deserialize)] +pub struct TransactionPoolState { + pub(super) pool: ledger::transaction_pool::TransactionPool, + pub(super) pending_actions: BTreeMap, + pub(super) pending_id: PendingId, + pub(super) best_tip_hash: Option, + /// For debug only + #[serde(skip)] + pub(super) file: Option, +} + +impl Clone for TransactionPoolState { + fn clone(&self) -> Self { + Self { + pool: self.pool.clone(), + pending_actions: self.pending_actions.clone(), + pending_id: self.pending_id, + best_tip_hash: self.best_tip_hash.clone(), + file: None, + } + } +} + +impl TransactionPoolState { + pub fn new(config: Config, consensus_constants: &ConsensusConstants) -> Self { + Self { + pool: ledger::transaction_pool::TransactionPool::new(config, consensus_constants), + pending_actions: Default::default(), + pending_id: 0, + best_tip_hash: None, + file: None, + } + } + + pub fn size(&self) -> usize { + self.pool.size() + } + + pub fn transactions(&mut self, limit: usize) -> Vec { + self.pool.transactions(limit) + } + + pub fn list_includable_transactions(&self, limit: usize) -> Vec { + self.pool.list_includable_transactions(limit) + } + + pub fn get_all_transactions(&self) -> Vec { + self.pool.get_all_transactions() + } + + pub fn get_pending_amount_and_nonce(&self) -> HashMap, Amount)> { + self.pool.get_pending_amount_and_nonce() + } + + fn next_pending_id(&mut self) -> PendingId { + let id = self.pending_id; + self.pending_id = self.pending_id.wrapping_add(1); + id + } + + pub(super) fn make_action_pending(&mut self, action: &TransactionPoolAction) -> PendingId { + let id = self.next_pending_id(); + self.pending_actions.insert(id, action.clone()); + id + } + + #[allow(dead_code)] + fn save_actions(state: &mut crate::Substate) { + let substate = state.get_substate_mut().unwrap(); + if substate.file.is_none() { + let mut file = std::fs::File::create("/tmp/pool.bin").unwrap(); + postcard::to_io(&state.unsafe_get_state(), &mut file).unwrap(); + let substate = state.get_substate_mut().unwrap(); + substate.file = Some(file); + } + } + + pub(super) fn global_slots(state: &crate::State) -> Option<(Slot, Slot)> { + Some(( + Slot::from_u32(state.cur_global_slot()?), + Slot::from_u32(state.cur_global_slot_since_genesis()?), + )) + } +} + +#[cfg(test)] +mod tests { + use super::super::TransactionPoolActionWithMeta; + use super::*; + use crate::State; + use redux::Dispatcher; + + #[allow(unused)] + #[test] + fn test_replay_pool() { + let vec = std::fs::read("/tmp/pool.bin").unwrap(); + let slice = vec.as_slice(); + + let (mut state, rest) = postcard::take_from_bytes::(slice).unwrap(); + let mut slice = rest; + + while let Ok((action, rest)) = + postcard::take_from_bytes::(slice) + { + slice = rest; + + let mut dispatcher = Dispatcher::new(); + let state = crate::Substate::::new(&mut state, &mut dispatcher); + let (action, meta) = action.split(); + + TransactionPoolState::handle_action(state, meta.with_action(&action)); + } + } +} From d9b4e3527404b569784566a701bf27d7d3c4fe5a Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Fri, 22 Nov 2024 12:40:22 +0100 Subject: [PATCH 097/175] Move `poseidon` code out of `ledger` --- Cargo.lock | 10 + Cargo.toml | 2 + ledger/Cargo.toml | 1 + ledger/src/hash.rs | 14 +- ledger/src/lib.rs | 2 - ledger/src/poseidon/fq_params.rs | 833 -------- ledger/src/poseidon/mod.rs | 1940 ------------------ ledger/src/proofs/field.rs | 2 +- ledger/src/proofs/opt_sponge.rs | 6 +- ledger/src/proofs/step.rs | 20 +- ledger/src/proofs/transaction.rs | 47 +- ledger/src/proofs/wrap.rs | 5 +- poseidon/Cargo.toml | 12 + poseidon/src/lib.rs | 280 +++ poseidon/src/params.rs | 3127 ++++++++++++++++++++++++++++++ 15 files changed, 3477 insertions(+), 2824 deletions(-) delete mode 100644 ledger/src/poseidon/fq_params.rs delete mode 100644 ledger/src/poseidon/mod.rs create mode 100644 poseidon/Cargo.toml create mode 100644 poseidon/src/lib.rs create mode 100644 poseidon/src/params.rs diff --git a/Cargo.lock b/Cargo.lock index d1f047edb3..c525bdbd9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3871,6 +3871,7 @@ dependencies = [ "openmina-core", "openmina-macros", "poly-commitment", + "poseidon", "postcard", "rand", "rand_pcg", @@ -5356,6 +5357,15 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +[[package]] +name = "poseidon" +version = "0.1.0" +dependencies = [ + "ark-ff", + "mina-curves", + "once_cell", +] + [[package]] name = "postcard" version = "1.0.10" diff --git a/Cargo.toml b/Cargo.toml index acaccb5bf5..a3b2654a28 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,6 +20,7 @@ members = [ "mina-p2p-messages", "ledger", + "poseidon", "tools/transport", "tools/bootstrap-sandbox", @@ -42,6 +43,7 @@ indexing_slicing = "warn" [workspace.dependencies] mina-p2p-messages = { path = "mina-p2p-messages" } +poseidon = { path = "poseidon" } ledger = { path = "ledger", package = "mina-tree" } mina-hasher = { git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7" } mina-signer = { git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 7c5c174d0c..1ee368eadf 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -27,6 +27,7 @@ kimchi = { workspace = true } mina-poseidon = { workspace = true } poly-commitment = { workspace = true } juniper = { workspace = true } +poseidon = { workspace = true } openmina-macros = { path = "../macros" } strum = "0.26.2" strum_macros = "0.26.4" diff --git a/ledger/src/hash.rs b/ledger/src/hash.rs index b417c9a2a7..575acf52fe 100644 --- a/ledger/src/hash.rs +++ b/ledger/src/hash.rs @@ -3,12 +3,8 @@ use mina_hasher::Fp; use mina_signer::CompressedPubKey; // use oracle::{poseidon::{ArithmeticSponge, Sponge}, constants::PlonkSpongeConstantsKimchi, pasta::fp_kimchi::static_params}; -use crate::{ - poseidon::{static_params, ArithmeticSponge, PlonkSpongeConstantsKimchi, Sponge}, - proofs::witness::Witness, - scan_state::currency, - FpExt, SpongeParamsForField, -}; +use crate::{proofs::witness::Witness, scan_state::currency, FpExt}; +use poseidon::{ArithmeticSponge, SpongeParamsForField}; enum Item { Bool(bool), @@ -216,7 +212,7 @@ fn param_to_field_noinputs(param: &str) -> Fp { } pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = ArithmeticSponge::::new(static_params()); + let mut sponge = ArithmeticSponge::::new(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); @@ -226,14 +222,14 @@ pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { } pub fn hash_fields>(fields: &[F]) -> F { - let mut sponge = ArithmeticSponge::::new(F::get_params()); + let mut sponge = ArithmeticSponge::::new(); sponge.absorb(fields); sponge.squeeze() } pub fn hash_noinputs(param: &str) -> Fp { - let mut sponge = ArithmeticSponge::::new(static_params()); + let mut sponge = ArithmeticSponge::::new(); // ArithmeticSponge::::new(pasta::fp_kimchi::static_params()); sponge.absorb(&[param_to_field_noinputs(param)]); diff --git a/ledger/src/lib.rs b/ledger/src/lib.rs index 7fefb43e9c..19f4de3232 100644 --- a/ledger/src/lib.rs +++ b/ledger/src/lib.rs @@ -53,7 +53,6 @@ mod hash; pub mod mask; pub mod ondisk; mod port_ocaml; -mod poseidon; pub mod proofs; pub mod scan_state; pub mod sparse_ledger; @@ -72,7 +71,6 @@ pub use base::*; pub use database::*; pub use hash::*; pub use mask::*; -pub use poseidon::*; pub use tree::*; pub use tree_version::*; pub use util::*; diff --git a/ledger/src/poseidon/fq_params.rs b/ledger/src/poseidon/fq_params.rs deleted file mode 100644 index d946204eb8..0000000000 --- a/ledger/src/poseidon/fq_params.rs +++ /dev/null @@ -1,833 +0,0 @@ -use std::str::FromStr; - -use mina_curves::pasta::Fq; -use once_cell::sync::Lazy; - -use crate::ArithmeticSpongeParams; - -pub fn params() -> ArithmeticSpongeParams { - ArithmeticSpongeParams { - mds: [ - [ - Fq::from_str( - "28115781186772277486790024060542467295096710153315236019619365740021995624782", - ) - .unwrap(), - Fq::from_str( - "22098002279041163367053200604969603243328318626084412751290336872362628294144", - ) - .unwrap(), - Fq::from_str( - "10518156075882958317589806716220047551309200159506906232124952575033472931386", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8515206633865386306014865142947895502833797732365705727001733785057042819852", - ) - .unwrap(), - Fq::from_str( - "19310731234716792175834594131802557577955166208124819468043130037927500684373", - ) - .unwrap(), - Fq::from_str( - "361439796332338311597104753147071943681730695313819021679602959964518909239", - ) - .unwrap(), - ], - [ - Fq::from_str( - "2193808570710678216879007026210418088296432071066284289131688133644970611483", - ) - .unwrap(), - Fq::from_str( - "1201496953174589855481629688627002262719699487577300614284420648015658009380", - ) - .unwrap(), - Fq::from_str( - "11619800255560837597192574795389782851917036920101027584480912719351481334717", - ) - .unwrap(), - ], - ], - round_constants: [ - [ - Fq::from_str( - "2517640872121921965298496967863234221143680281046699148760560696057284005606", - ) - .unwrap(), - Fq::from_str( - "3391756047431116221709518926936538303706203177575259437741546230828058541679", - ) - .unwrap(), - Fq::from_str( - "28193080211857729746868575888309975056941007202713113547154010421664334143056", - ) - .unwrap(), - ], - [ - Fq::from_str( - "25261619184426186938919514618416881383323154981235406731208902193655587998749", - ) - .unwrap(), - Fq::from_str( - "5438499261516835502981531641588657477212528137520578797088407969732830437134", - ) - .unwrap(), - Fq::from_str( - "1447697894671779324954748568939217281372628544919576009518449387265606369859", - ) - .unwrap(), - ], - [ - Fq::from_str( - "5035532530235542599906399941203951970682478985022204457211063504597080640029", - ) - .unwrap(), - Fq::from_str( - "18548939393800290417015907795270784249198528773378593112394621615021029911007", - ) - .unwrap(), - Fq::from_str( - "28314657632459005492203969796973258399484591559931227050853551342156833947891", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10075465805557971120845970058070916255338843492716768289922460436606689369477", - ) - .unwrap(), - Fq::from_str( - "21985996556868691161386211003270106475915714625334030557267947035839814254081", - ) - .unwrap(), - Fq::from_str( - "9778523497398309788873186849997676949503189428912377745814036481347657299161", - ) - .unwrap(), - ], - [ - Fq::from_str( - "6085447467925843146276340167082679235758707259098174769103982431882228334038", - ) - .unwrap(), - Fq::from_str( - "11214803418623679719680560978819619149235769633101428825693192995405955507848", - ) - .unwrap(), - Fq::from_str( - "20585482519401972421539035665320299097144487427998598740316244173221216198246", - ) - .unwrap(), - ], - [ - Fq::from_str( - "18602266896623204184748247002001496873223612100325866696399863661914256384486", - ) - .unwrap(), - Fq::from_str( - "22165919841309962137671309308234475433816142848229812860682345190836583925843", - ) - .unwrap(), - Fq::from_str( - "22833505632200982123686653495190412951871851216487329681987951602744930627412", - ) - .unwrap(), - ], - [ - Fq::from_str( - "200996541962081036547810490655955282117589336000744078845964972887355639644", - ) - .unwrap(), - Fq::from_str( - "17159390488590225463405148524511348095493761844950655304775985535830170165304", - ) - .unwrap(), - Fq::from_str( - "7519689807382250126180254188667761476713509751388558140260305473388567529705", - ) - .unwrap(), - ], - [ - Fq::from_str( - "14159331841037307097148990917607709903712709092721125605507719995418592745663", - ) - .unwrap(), - Fq::from_str( - "10490695046555645615062072066940833278139280813429718770298136076375411280286", - ) - .unwrap(), - Fq::from_str( - "9996921069626538041923613626115903019578182147993504053879837245826104687293", - ) - .unwrap(), - ], - [ - Fq::from_str( - "28009241574980093348462093077828465154604666812509186537490618830383877236685", - ) - .unwrap(), - Fq::from_str( - "18925279443828804264179873719494108834579217607847079902207023181925588871175", - ) - .unwrap(), - Fq::from_str( - "13126164514615718686767880517156253918404905174962666942976286681458411835722", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1125667389564136291825905670957082668987611691949011617627091942772124917554", - ) - .unwrap(), - Fq::from_str( - "12737072162917928935765906421286553437026542524142430058538254259863452556200", - ) - .unwrap(), - Fq::from_str( - "9855113244149548216327019561589719324434080884827484555441182992249251832158", - ) - .unwrap(), - ], - [ - Fq::from_str( - "6006604346195593001833550983798183088851044846011297061071167569148810544010", - ) - .unwrap(), - Fq::from_str( - "23783465709464699444911580329342599880163107932561352210466223087637763994288", - ) - .unwrap(), - Fq::from_str( - "1581060363083815351710754851350813999229829634252940169154424073664057276774", - ) - .unwrap(), - ], - [ - Fq::from_str( - "24121961545310887440574053281799796355427122479626872394472157625455666323022", - ) - .unwrap(), - Fq::from_str( - "23925781309638869606256007860000699567158045595326122474217734988331349678475", - ) - .unwrap(), - Fq::from_str( - "433512980570318160778040929743715681206456334448542248765142091911433454703", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8080307140515367021419180108267113624095868360927897204642243727009503935719", - ) - .unwrap(), - Fq::from_str( - "13661807750191096117929173962837770733539092996971801228126331071941306856508", - ) - .unwrap(), - Fq::from_str( - "9268394414065063505331314418649987795374055416089324253185088859000252370756", - ) - .unwrap(), - ], - [ - Fq::from_str( - "22374115023493407761095751712373350824513305398485824175669182288521610150311", - ) - .unwrap(), - Fq::from_str( - "22951274634403942446739133926874770994604864227598567536319143390467218980824", - ) - .unwrap(), - Fq::from_str( - "21411532836345163980832919797897483979345524322135010935120723250070247464549", - ) - .unwrap(), - ], - [ - Fq::from_str( - "20688285497159372157224857370703211924056803904697620218749985029000049442943", - ) - .unwrap(), - Fq::from_str( - "8350087190167057556241775495760369408781696125331535735138679647687106863977", - ) - .unwrap(), - Fq::from_str( - "13485893160159637778707269611856683957779710980787754997470728774769162419576", - ) - .unwrap(), - ], - [ - Fq::from_str( - "4621792784192688819920303666439776744566536330750316034321950771579978771021", - ) - .unwrap(), - Fq::from_str( - "13900656491552343190424687336475573267660717627286734246676255663734655019912", - ) - .unwrap(), - Fq::from_str( - "16577037405341365304416318048187907895286388691199320947077947552959834207823", - ) - .unwrap(), - ], - [ - Fq::from_str( - "17453637937712580666297652202332273322112052411250919589546137386514183913993", - ) - .unwrap(), - Fq::from_str( - "9852736110707561006399582579453396957225552488023642073454517393228764176471", - ) - .unwrap(), - Fq::from_str( - "8053970357622019747109700798952789019805031210730923951116580579194625334710", - ) - .unwrap(), - ], - [ - Fq::from_str( - "14566849926060034944494603512439278530775668595134329897253012222562109882008", - ) - .unwrap(), - Fq::from_str( - "8863944349051942080060073891691580009950648437676309749771884964336231381737", - ) - .unwrap(), - Fq::from_str( - "16455762285584757654310476505019438984453107876908065440396394186006196612077", - ) - .unwrap(), - ], - [ - Fq::from_str( - "28098375311516838082882166381119795701982164671360574802728073046992978741339", - ) - .unwrap(), - Fq::from_str( - "13538346067341652694825445642847479918140731375902310280683284825070643960891", - ) - .unwrap(), - Fq::from_str( - "18313412784975078534612748781201087502203257054025866271209086293337241477805", - ) - .unwrap(), - ], - [ - Fq::from_str( - "24807061345703288899043018750567607387907450632666147403804744880717736838940", - ) - .unwrap(), - Fq::from_str( - "16638378638176552952794487891875614248110181610295183306789394461536640085108", - ) - .unwrap(), - Fq::from_str( - "2342874860138849081032934096750004917991517717553229739958552529472431319656", - ) - .unwrap(), - ], - [ - Fq::from_str( - "21631810094765090996871180483650934431972930909326270651252393395613356531282", - ) - .unwrap(), - Fq::from_str( - "2220759912186713489010197903069023809260408491503960321105305330086947471014", - ) - .unwrap(), - Fq::from_str( - "14815764944505758746761442212662459585220143243155504464852948007238083120696", - ) - .unwrap(), - ], - [ - Fq::from_str( - "23947619952183462858644581465494050309407721428302029371055887418452994318961", - ) - .unwrap(), - Fq::from_str( - "25035254658153233628169609451068923631269927394392748023889572264723092874720", - ) - .unwrap(), - Fq::from_str( - "17468020412163678868776493601957969748197290347006692843306595815987772942732", - ) - .unwrap(), - ], - [ - Fq::from_str( - "15262198027618900223004625662874755104828479630165814039838611768431063172994", - ) - .unwrap(), - Fq::from_str( - "25161066724266754383358798644805908588326959881061318668106454787543611445887", - ) - .unwrap(), - Fq::from_str( - "2454250001039770891411267760383268680504653332090622148533496270387793031332", - ) - .unwrap(), - ], - [ - Fq::from_str( - "9171946491887082474979985164918822959719377078284664312866368737511724712644", - ) - .unwrap(), - Fq::from_str( - "6672870238005411132577302023934139592378291207852994424857452575898007687159", - ) - .unwrap(), - Fq::from_str( - "2950400608762766076731526167833938554190979516192019010641815746350334547745", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10653725154501691589476837895400001173933804810435931645261606197625601363132", - ) - .unwrap(), - Fq::from_str( - "12717400214508961810851553873706609743505640660238109459222577386574996883747", - ) - .unwrap(), - Fq::from_str( - "5871058785976817081042949511195036111847495052209270758342334312740290470200", - ) - .unwrap(), - ], - [ - Fq::from_str( - "18192562665205900830717234913238180302424621739145466326708104656354353538015", - ) - .unwrap(), - Fq::from_str( - "19946412409172091711185698839696950657650658896270607012902209489827790455314", - ) - .unwrap(), - Fq::from_str( - "21997416257528392077410699901606794827305154904508120972585193876767785262539", - ) - .unwrap(), - ], - [ - Fq::from_str( - "16525092684784199198745517563091041705366544303388462641935777835264970071331", - ) - .unwrap(), - Fq::from_str( - "27613372589672512522307803997948488817865025374001297632527692577079750053456", - ) - .unwrap(), - Fq::from_str( - "23369674747888778238616865774843237791546925005553032792584302158017141634655", - ) - .unwrap(), - ], - [ - Fq::from_str( - "11012136308159330675912474383855146192700147583104742924419195363346115019405", - ) - .unwrap(), - Fq::from_str( - "20632243971343595216801828590185617698839041744000918292113739726624680548813", - ) - .unwrap(), - Fq::from_str( - "10530371852841765918702282883445676639977895775479854136871270050807595649710", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1610594053831245596683250788274018471388810111366046583216577135605955718023", - ) - .unwrap(), - Fq::from_str( - "452300846172044702598793611907955884294868639769163388132276731316720796255", - ) - .unwrap(), - Fq::from_str( - "22297945145153422883128810575530182077542612397826351322358420927950400316504", - ) - .unwrap(), - ], - [ - Fq::from_str( - "28212510899948152845929142163236606049756849316851154583029383581129293825706", - ) - .unwrap(), - Fq::from_str( - "28325924586146971645663587791728624896861517146549428987043066595915712075981", - ) - .unwrap(), - Fq::from_str( - "23489013325315178311518261165509151135555509351661386106070231815049642443022", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10150108696154604591036176090028652090941375062280095655463112192524823306544", - ) - .unwrap(), - Fq::from_str( - "14935856239824547404885450872472169780177654619496758596151670953532153419587", - ) - .unwrap(), - Fq::from_str( - "4367251608666794961207658726914177158125339342277880902441218521648798930454", - ) - .unwrap(), - ], - [ - Fq::from_str( - "14278046449956534912766622635951826857049583276976844525135170835571509013020", - ) - .unwrap(), - Fq::from_str( - "11627801940273881243235293875277734806211947530882079339115454640100174268255", - ) - .unwrap(), - Fq::from_str( - "22853853581419894582873479603685652928885253184240650995805892818180355600894", - ) - .unwrap(), - ], - [ - Fq::from_str( - "4405193089432137585625363585733613667088817369599257533888439029942466720878", - ) - .unwrap(), - Fq::from_str( - "26434497741746827048559732407319982377645052620918789373329661707603241810667", - ) - .unwrap(), - Fq::from_str( - "23558650878002025381506445692526977061352711282820117441110868042756853707843", - ) - .unwrap(), - ], - [ - Fq::from_str( - "27427423077748345654234924309581695092179468167973406115643356520054395647078", - ) - .unwrap(), - Fq::from_str( - "17585801825757985265979208086560185342609289319992678737491966299829354657891", - ) - .unwrap(), - Fq::from_str( - "22079131836316223121286612953926945430480043835170303484162677394496378207190", - ) - .unwrap(), - ], - [ - Fq::from_str( - "20126865597655889981803452476686954944892814234259869552204215672627920656068", - ) - .unwrap(), - Fq::from_str( - "5591585339015997308682985123056479221565470335707041924016523106405300562835", - ) - .unwrap(), - Fq::from_str( - "9422316572086279209843572429137982927615080330725918371521370800874341571474", - ) - .unwrap(), - ], - [ - Fq::from_str( - "2735677349719528139570614238939713941030373684882307164259316901880218894412", - ) - .unwrap(), - Fq::from_str( - "16229147459127626384090303399894157248853232127961182470501666316464149067069", - ) - .unwrap(), - Fq::from_str( - "17151067888069760812629817914442472623785916486309268828873486698948911058517", - ) - .unwrap(), - ], - [ - Fq::from_str( - "13833972862865550568348750465964022581895521701070662509936215512761615491351", - ) - .unwrap(), - Fq::from_str( - "9624679817699048440664645568701817641311119158936258215534754849666144699339", - ) - .unwrap(), - Fq::from_str( - "10273179847163882031630140477902608240997857384703412878925192706057610103613", - ) - .unwrap(), - ], - [ - Fq::from_str( - "3172037826021850467928085880043492158321918352296515787555947245998877188849", - ) - .unwrap(), - Fq::from_str( - "28890802281119993101506497911757988639840653958256859430239635494708187190915", - ) - .unwrap(), - Fq::from_str( - "23496953773368274731821824281559682992786773767847557735733251263969009271239", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1509044982655321910215442389040863370827049078919961070795919190828975736187", - ) - .unwrap(), - Fq::from_str( - "13927172650979098916742472053302036482743492746437467103459483008024082210879", - ) - .unwrap(), - Fq::from_str( - "17248379591027039069313293591621091031164062825086122980769287846951363066520", - ) - .unwrap(), - ], - [ - Fq::from_str( - "11350333545134487336540967650634077894516131586708748380417042089147896079201", - ) - .unwrap(), - Fq::from_str( - "639497848254405996993150855123515463224731962182127668267769103213580096582", - ) - .unwrap(), - Fq::from_str( - "24528361599642320451530127347946798949257664936307333999618279589325586618880", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8217015496508457685301448884203977810298711070026260090660268003968421268717", - ) - .unwrap(), - Fq::from_str( - "6703444480721420507060701216472376128524677965704475494357937059812166295103", - ) - .unwrap(), - Fq::from_str( - "8051365375874262471960241848873604339195556527603956582828833313772444122472", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10412735174026641936105532807659667596947675372330827493649954160029449767122", - ) - .unwrap(), - Fq::from_str( - "8447576362386697729021229138353952824970707645851763166490398451107606293885", - ) - .unwrap(), - Fq::from_str( - "4802965296970904162106502573136505305073730277702271660292532219583823320181", - ) - .unwrap(), - ], - [ - Fq::from_str( - "3244354881334856885788568976540712586633556478250043997221528214026130052269", - ) - .unwrap(), - Fq::from_str( - "817270901440592571623549787267103386561304980129799240746702119063425010300", - ) - .unwrap(), - Fq::from_str( - "6566338353152134577893356938981496347522747926131278635019050445923229718029", - ) - .unwrap(), - ], - [ - Fq::from_str( - "4854521709622003124815206874897232905514824969466266873443062691298769768277", - ) - .unwrap(), - Fq::from_str( - "12830134034124699064152980183243986699241944691238427861184919962819448276943", - ) - .unwrap(), - Fq::from_str( - "24309439157688106320977023683093060719537142150089588950480669629964661236785", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1853791709949511636795588377016980571084333441972847324139062389997895453872", - ) - .unwrap(), - Fq::from_str( - "11399505004623970417786749745036397690793259153591025248188283534764565207306", - ) - .unwrap(), - Fq::from_str( - "6280235834578097246976697944083887557501831809932305676532914637669922657807", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1516294190187225192808636261678393666537186816904214776860202535671714230097", - ) - .unwrap(), - Fq::from_str( - "5835813607391397757416951433662507638966861369364000865214031356023042341328", - ) - .unwrap(), - Fq::from_str( - "25777313996516799380163546628133415256678997511953860435781885414872422583905", - ) - .unwrap(), - ], - [ - Fq::from_str( - "9749298878960864917089442034293906589697892682402070689770627645324414273893", - ) - .unwrap(), - Fq::from_str( - "19986612197193695239708718365565978831607994386509967951279410162135133793419", - ) - .unwrap(), - Fq::from_str( - "5020585421647265067890838871263925730422335215511670656851726444447972642755", - ) - .unwrap(), - ], - [ - Fq::from_str( - "7256822974971238434100017358319972368738353570339258522235883585691301791128", - ) - .unwrap(), - Fq::from_str( - "9789139064283320903202623693175751994730652446378861671859478926598420184293", - ) - .unwrap(), - Fq::from_str( - "19283468246375057076525422714896652730563534118070235174488237489890270899533", - ) - .unwrap(), - ], - [ - Fq::from_str( - "11487321478704551489982188818171823402443882145686911658585221913500937481156", - ) - .unwrap(), - Fq::from_str( - "16513958012405406860890342996091255867910990589443610357743227675107758695101", - ) - .unwrap(), - Fq::from_str( - "24764429351173766080138047602436205744310671344674490826288279531917797263231", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8256258316375000496541664568891934707113720493937218096466691600593595285909", - ) - .unwrap(), - Fq::from_str( - "26919625894863883593081175799908601863265420311251948374988589188905317081443", - ) - .unwrap(), - Fq::from_str( - "10135851848127171199130812615581006825969108287418884763125596866448544567342", - ) - .unwrap(), - ], - [ - Fq::from_str( - "17567146349912867622479843655652582453162587996421871126612027345809646551661", - ) - .unwrap(), - Fq::from_str( - "2524802431860351616270075327416865184018211992251290134350377936184047953453", - ) - .unwrap(), - Fq::from_str( - "3417609143162661859785838333493682460709943782149216513733553607075915176256", - ) - .unwrap(), - ], - [ - Fq::from_str( - "6906455011502599710165862205505812668908382042647994457156780865092846286493", - ) - .unwrap(), - Fq::from_str( - "21042097659487317081899343674473811663642293019125869396575405454328274948985", - ) - .unwrap(), - Fq::from_str( - "25222370053690749913129090298406788520061040938312366403907461864202905656238", - ) - .unwrap(), - ], - [ - Fq::from_str( - "18933201791079410639949505893100361911334261775545573219434897335758052335005", - ) - .unwrap(), - Fq::from_str( - "14503331557348715387048413780116585195932777696828173626366829282421027153184", - ) - .unwrap(), - Fq::from_str( - "3558781473325529402549318082942465709639711182863041375748599816583729962116", - ) - .unwrap(), - ], - [ - Fq::from_str( - "23932570601084008621895097434501731960424360312878373523779451810455362953625", - ) - .unwrap(), - Fq::from_str( - "13286131463754478912858022007443470896920464302917391606059553157137090717219", - ) - .unwrap(), - Fq::from_str( - "9969435194445819847988134248075866286921574284754991873902788928171429847506", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10821551500865029673311799086099720530496516676117927814621168667836737594374", - ) - .unwrap(), - Fq::from_str( - "57689402905128519605376551862931564078571458212398163192591670282543962941", - ) - .unwrap(), - Fq::from_str( - "4484359679395800410695081358212522306960518636189521201445105538223906998486", - ) - .unwrap(), - ], - ], - } -} - -/// the fq sponge params -pub fn static_fq_params() -> &'static ArithmeticSpongeParams { - static PARAMS: Lazy> = Lazy::new(params); - &PARAMS -} diff --git a/ledger/src/poseidon/mod.rs b/ledger/src/poseidon/mod.rs deleted file mode 100644 index 48ebf59fb3..0000000000 --- a/ledger/src/poseidon/mod.rs +++ /dev/null @@ -1,1940 +0,0 @@ -// use crate::constants::SpongeConstants; -// use crate::permutation::{full_round, poseidon_block_cipher}; -use ark_ff::Field; -use mina_curves::pasta::Fq; -use mina_hasher::Fp; -use once_cell::sync::Lazy; - -use std::str::FromStr; - -#[cfg(not(target_family = "wasm"))] -mod fp; - -mod fq_params; - -pub use fq_params::*; - -pub fn make_params() -> ArithmeticSpongeParams { - ArithmeticSpongeParams { - mds: [ - [ - Fp::from_str( - "12035446894107573964500871153637039653510326950134440362813193268448863222019", - ) - .unwrap(), - Fp::from_str( - "25461374787957152039031444204194007219326765802730624564074257060397341542093", - ) - .unwrap(), - Fp::from_str( - "27667907157110496066452777015908813333407980290333709698851344970789663080149", - ) - .unwrap(), - ], - [ - Fp::from_str( - "4491931056866994439025447213644536587424785196363427220456343191847333476930", - ) - .unwrap(), - Fp::from_str( - "14743631939509747387607291926699970421064627808101543132147270746750887019919", - ) - .unwrap(), - Fp::from_str( - "9448400033389617131295304336481030167723486090288313334230651810071857784477", - ) - .unwrap(), - ], - [ - Fp::from_str( - "10525578725509990281643336361904863911009900817790387635342941550657754064843", - ) - .unwrap(), - Fp::from_str( - "27437632000253211280915908546961303399777448677029255413769125486614773776695", - ) - .unwrap(), - Fp::from_str( - "27566319851776897085443681456689352477426926500749993803132851225169606086988", - ) - .unwrap(), - ], - ], - - round_constants: [ - [ - Fp::from_str( - "21155079691556475130150866428468322463125560312786319980770950159250751855431", - ) - .unwrap(), - Fp::from_str( - "16883442198399350202652499677723930673110172289234921799701652810789093522349", - ) - .unwrap(), - Fp::from_str( - "17030687036425314703519085065002231920937594822150793091243263847382891822670", - ) - .unwrap(), - ], - [ - Fp::from_str( - "25216718237129482752721276445368692059997901880654047883630276346421457427360", - ) - .unwrap(), - Fp::from_str( - "9054264347380455706540423067244764093107767235485930776517975315876127782582", - ) - .unwrap(), - Fp::from_str( - "26439087121446593160953570192891907825526260324480347638727375735543609856888", - ) - .unwrap(), - ], - [ - Fp::from_str( - "15251000790817261169639394496851831733819930596125214313084182526610855787494", - ) - .unwrap(), - Fp::from_str( - "10861916012597714684433535077722887124099023163589869801449218212493070551767", - ) - .unwrap(), - Fp::from_str( - "18597653523270601187312528478986388028263730767495975370566527202946430104139", - ) - .unwrap(), - ], - [ - Fp::from_str( - "15831416454198644276563319006805490049460322229057756462580029181847589006611", - ) - .unwrap(), - Fp::from_str( - "15171856919255965617705854914448645702014039524159471542852132430360867202292", - ) - .unwrap(), - Fp::from_str( - "15488495958879593647482715143904752785889816789652405888927117106448507625751", - ) - .unwrap(), - ], - [ - Fp::from_str( - "19039802679983063488134304670998725949842655199289961967801223969839823940152", - ) - .unwrap(), - Fp::from_str( - "4720101937153217036737330058775388037616286510783561045464678919473230044408", - ) - .unwrap(), - Fp::from_str( - "10226318327254973427513859412126640040910264416718766418164893837597674300190", - ) - .unwrap(), - ], - [ - Fp::from_str( - "20878756131129218406920515859235137275859844638301967889441262030146031838819", - ) - .unwrap(), - Fp::from_str( - "7178475685651744631172532830973371642652029385893667810726019303466125436953", - ) - .unwrap(), - Fp::from_str( - "1996970955918516145107673266490486752153434673064635795711751450164177339618", - ) - .unwrap(), - ], - [ - Fp::from_str( - "15205545916434157464929420145756897321482314798910153575340430817222504672630", - ) - .unwrap(), - Fp::from_str( - "25660296961552699573824264215804279051322332899472350724416657386062327210698", - ) - .unwrap(), - Fp::from_str( - "13842611741937412200312851417353455040950878279339067816479233688850376089318", - ) - .unwrap(), - ], - [ - Fp::from_str( - "1383799642177300432144836486981606294838630135265094078921115713566691160459", - ) - .unwrap(), - Fp::from_str( - "1135532281155277588005319334542025976079676424839948500020664227027300010929", - ) - .unwrap(), - Fp::from_str( - "4384117336930380014868572224801371377488688194169758696438185377724744869360", - ) - .unwrap(), - ], - [ - Fp::from_str( - "21725577575710270071808882335900370909424604447083353471892004026180492193649", - ) - .unwrap(), - Fp::from_str( - "676128913284806802699862508051022306366147359505124346651466289788974059668", - ) - .unwrap(), - Fp::from_str( - "25186611339598418732666781049829183886812651492845008333418424746493100589207", - ) - .unwrap(), - ], - [ - Fp::from_str( - "10402240124664763733060094237696964473609580414190944671778761753887884341073", - ) - .unwrap(), - Fp::from_str( - "11918307118590866200687906627767559273324023585642003803337447146531313172441", - ) - .unwrap(), - Fp::from_str( - "16895677254395661024186292503536662354181715337630376909778003268311296637301", - ) - .unwrap(), - ], - [ - Fp::from_str( - "23818602699032741669874498456696325705498383130221297580399035778119213224810", - ) - .unwrap(), - Fp::from_str( - "4285193711150023248690088154344086684336247475445482883105661485741762600154", - ) - .unwrap(), - Fp::from_str( - "19133204443389422404056150665863951250222934590192266371578950735825153238612", - ) - .unwrap(), - ], - [ - Fp::from_str( - "5515589673266504033533906836494002702866463791762187140099560583198974233395", - ) - .unwrap(), - Fp::from_str( - "11830435563729472715615302060564876527985621376031612798386367965451821182352", - ) - .unwrap(), - Fp::from_str( - "7510711479224915247011074129666445216001563200717943545636462819681638560128", - ) - .unwrap(), - ], - [ - Fp::from_str( - "24694843201907722940091503626731830056550128225297370217610328578733387733444", - ) - .unwrap(), - Fp::from_str( - "27361655066973784653563425664091383058914302579694897188019422193564924110528", - ) - .unwrap(), - Fp::from_str( - "21606788186194534241166833954371013788633495786419718955480491478044413102713", - ) - .unwrap(), - ], - [ - Fp::from_str( - "19934060063390905409309407607814787335159021816537006003398035237707924006757", - ) - .unwrap(), - Fp::from_str( - "8495813630060004961768092461554180468161254914257386012937942498774724649553", - ) - .unwrap(), - Fp::from_str( - "27524960680529762202005330464726908693944660961000958842417927307941561848461", - ) - .unwrap(), - ], - [ - Fp::from_str( - "15178481650950399259757805400615635703086255035073919114667254549690862896985", - ) - .unwrap(), - Fp::from_str( - "16164780354695672259791105197274509251141405713012804937107314962551600380870", - ) - .unwrap(), - Fp::from_str( - "10529167793600778056702353412758954281652843049850979705476598375597148191979", - ) - .unwrap(), - ], - [ - Fp::from_str( - "721141070179074082553302896292167103755384741083338957818644728290501449040", - ) - .unwrap(), - Fp::from_str( - "22044408985956234023934090378372374883099115753118261312473550998188148912041", - ) - .unwrap(), - Fp::from_str( - "27068254103241989852888872162525066148367014691482601147536314217249046186315", - ) - .unwrap(), - ], - [ - Fp::from_str( - "3880429241956357176819112098792744584376727450211873998699580893624868748961", - ) - .unwrap(), - Fp::from_str( - "17387097125522937623262508065966749501583017524609697127088211568136333655623", - ) - .unwrap(), - Fp::from_str( - "6256814421247770895467770393029354017922744712896100913895513234184920631289", - ) - .unwrap(), - ], - [ - Fp::from_str( - "2942627347777337187690939671601251987500285937340386328746818861972711408579", - ) - .unwrap(), - Fp::from_str( - "24031654937764287280548628128490074801809101323243546313826173430897408945397", - ) - .unwrap(), - Fp::from_str( - "14401457902976567713827506689641442844921449636054278900045849050301331732143", - ) - .unwrap(), - ], - [ - Fp::from_str( - "20170632877385406450742199836933900257692624353889848352407590794211839130727", - ) - .unwrap(), - Fp::from_str( - "24056496193857444725324410428861722338174099794084586764867109123681727290181", - ) - .unwrap(), - Fp::from_str( - "11257913009612703357266904349759250619633397075667824800196659858304604714965", - ) - .unwrap(), - ], - [ - Fp::from_str( - "22228158921984425749199071461510152694025757871561406897041788037116931009246", - ) - .unwrap(), - Fp::from_str( - "9152163378317846541430311327336774331416267016980485920222768197583559318682", - ) - .unwrap(), - Fp::from_str( - "13906695403538884432896105059360907560653506400343268230130536740148070289175", - ) - .unwrap(), - ], - [ - Fp::from_str( - "7220714562509721437034241786731185291972496952091254931195414855962344025067", - ) - .unwrap(), - Fp::from_str( - "27608867305903811397208862801981345878179337369367554478205559689592889691927", - ) - .unwrap(), - Fp::from_str( - "13288465747219756218882697408422850918209170830515545272152965967042670763153", - ) - .unwrap(), - ], - [ - Fp::from_str( - "8251343892709140154567051772980662609566359215743613773155065627504813327653", - ) - .unwrap(), - Fp::from_str( - "22035238365102171608166944627493632660244312563934708756134297161332908879090", - ) - .unwrap(), - Fp::from_str( - "13560937766273321037807329177749403409731524715067067740487246745322577571823", - ) - .unwrap(), - ], - [ - Fp::from_str( - "21652518608959234550262559135285358020552897349934571164032339186996805408040", - ) - .unwrap(), - Fp::from_str( - "22479086963324173427634460342145551255011746993910136574926173581069603086891", - ) - .unwrap(), - Fp::from_str( - "13676501958531751140966255121288182631772843001727158043704693838707387130095", - ) - .unwrap(), - ], - [ - Fp::from_str( - "5680310394102577950568930199056707827608275306479994663197187031893244826674", - ) - .unwrap(), - Fp::from_str( - "25125360450906166639190392763071557410047335755341060350879819485506243289998", - ) - .unwrap(), - Fp::from_str( - "22659254028501616785029594492374243581602744364859762239504348429834224676676", - ) - .unwrap(), - ], - [ - Fp::from_str( - "23101411405087512171421838856759448177512679869882987631073569441496722536782", - ) - .unwrap(), - Fp::from_str( - "24149774013240355952057123660656464942409328637280437515964899830988178868108", - ) - .unwrap(), - Fp::from_str( - "5782097512368226173095183217893826020351125522160843964147125728530147423065", - ) - .unwrap(), - ], - [ - Fp::from_str( - "13540762114500083869920564649399977644344247485313990448129838910231204868111", - ) - .unwrap(), - Fp::from_str( - "20421637734328811337527547703833013277831804985438407401987624070721139913982", - ) - .unwrap(), - Fp::from_str( - "7742664118615900772129122541139124149525273579639574972380600206383923500701", - ) - .unwrap(), - ], - [ - Fp::from_str( - "1109643801053963021778418773196543643970146666329661268825691230294798976318", - ) - .unwrap(), - Fp::from_str( - "16580663920817053843121063692728699890952505074386761779275436996241901223840", - ) - .unwrap(), - Fp::from_str( - "14638514680222429058240285918830106208025229459346033470787111294847121792366", - ) - .unwrap(), - ], - [ - Fp::from_str( - "17080385857812672649489217965285727739557573467014392822992021264701563205891", - ) - .unwrap(), - Fp::from_str( - "26176268111736737558502775993925696791974738793095023824029827577569530708665", - ) - .unwrap(), - Fp::from_str( - "4382756253392449071896813428140986330161215829425086284611219278674857536001", - ) - .unwrap(), - ], - [ - Fp::from_str( - "13934033814940585315406666445960471293638427404971553891617533231178815348902", - ) - .unwrap(), - Fp::from_str( - "27054912732979753314774418228399230433963143177662848084045249524271046173121", - ) - .unwrap(), - Fp::from_str( - "28916070403698593376490976676534962592542013020010643734621202484860041243391", - ) - .unwrap(), - ], - [ - Fp::from_str( - "24820015636966360150164458094894587765384135259446295278101998130934963922381", - ) - .unwrap(), - Fp::from_str( - "7969535238488580655870884015145760954416088335296905520306227531221721881868", - ) - .unwrap(), - Fp::from_str( - "7690547696740080985104189563436871930607055124031711216224219523236060212249", - ) - .unwrap(), - ], - [ - Fp::from_str( - "9712576468091272384496248353414290908377825697488757134833205246106605867289", - ) - .unwrap(), - Fp::from_str( - "12148698031438398980683630141370402088785182722473169207262735228500190477924", - ) - .unwrap(), - Fp::from_str( - "14359657643133476969781351728574842164124292705609900285041476162075031948227", - ) - .unwrap(), - ], - [ - Fp::from_str( - "23563839965372067275137992801035780013422228997724286060975035719045352435470", - ) - .unwrap(), - Fp::from_str( - "4184634822776323233231956802962638484057536837393405750680645555481330909086", - ) - .unwrap(), - Fp::from_str( - "16249511905185772125762038789038193114431085603985079639889795722501216492487", - ) - .unwrap(), - ], - [ - Fp::from_str( - "11001863048692031559800673473526311616702863826063550559568315794438941516621", - ) - .unwrap(), - Fp::from_str( - "4702354107983530219070178410740869035350641284373933887080161024348425080464", - ) - .unwrap(), - Fp::from_str( - "23751680507533064238793742311430343910720206725883441625894258483004979501613", - ) - .unwrap(), - ], - [ - Fp::from_str( - "28670526516158451470169873496541739545860177757793329093045522432279094518766", - ) - .unwrap(), - Fp::from_str( - "3568312993091537758218792253361873752799472566055209125947589819564395417072", - ) - .unwrap(), - Fp::from_str( - "1819755756343439646550062754332039103654718693246396323207323333948654200950", - ) - .unwrap(), - ], - [ - Fp::from_str( - "5372129954699791301953948907349887257752247843844511069896766784624930478273", - ) - .unwrap(), - Fp::from_str( - "17512156688034945920605615850550150476471921176481039715733979181538491476080", - ) - .unwrap(), - Fp::from_str( - "25777105342317622165159064911913148785971147228777677435200128966844208883059", - ) - .unwrap(), - ], - [ - Fp::from_str( - "25350392006158741749134238306326265756085455157012701586003300872637887157982", - ) - .unwrap(), - Fp::from_str( - "20096724945283767296886159120145376967480397366990493578897615204296873954844", - ) - .unwrap(), - Fp::from_str( - "8063283381910110762785892100479219642751540456251198202214433355775540036851", - ) - .unwrap(), - ], - [ - Fp::from_str( - "4393613870462297385565277757207010824900723217720226130342463666351557475823", - ) - .unwrap(), - Fp::from_str( - "9874972555132910032057499689351411450892722671352476280351715757363137891038", - ) - .unwrap(), - Fp::from_str( - "23590926474329902351439438151596866311245682682435235170001347511997242904868", - ) - .unwrap(), - ], - [ - Fp::from_str( - "17723373371137275859467518615551278584842947963894791032296774955869958211070", - ) - .unwrap(), - Fp::from_str( - "2350345015303336966039836492267992193191479606566494799781846958620636621159", - ) - .unwrap(), - Fp::from_str( - "27755207882790211140683010581856487965587066971982625511152297537534623405016", - ) - .unwrap(), - ], - [ - Fp::from_str( - "6584607987789185408123601849106260907671314994378225066806060862710814193906", - ) - .unwrap(), - Fp::from_str( - "609759108847171587253578490536519506369136135254150754300671591987320319770", - ) - .unwrap(), - Fp::from_str( - "28435187585965602110074342250910608316032945187476441868666714022529803033083", - ) - .unwrap(), - ], - [ - Fp::from_str( - "16016664911651770663938916450245705908287192964254704641717751103464322455303", - ) - .unwrap(), - Fp::from_str( - "17551273293154696089066968171579395800922204266630874071186322718903959339163", - ) - .unwrap(), - Fp::from_str( - "20414195497994754529479032467015716938594722029047207834858832838081413050198", - ) - .unwrap(), - ], - [ - Fp::from_str( - "19773307918850685463180290966774465805537520595602496529624568184993487593855", - ) - .unwrap(), - Fp::from_str( - "24598603838812162820757838364185126333280131847747737533989799467867231166980", - ) - .unwrap(), - Fp::from_str( - "11040972566103463398651864390163813377135738019556270484707889323659789290225", - ) - .unwrap(), - ], - [ - Fp::from_str( - "5189242080957784038860188184443287562488963023922086723850863987437818393811", - ) - .unwrap(), - Fp::from_str( - "1435203288979376557721239239445613396009633263160237764653161500252258220144", - ) - .unwrap(), - Fp::from_str( - "13066591163578079667911016543985168493088721636164837520689376346534152547210", - ) - .unwrap(), - ], - [ - Fp::from_str( - "17345901407013599418148210465150865782628422047458024807490502489711252831342", - ) - .unwrap(), - Fp::from_str( - "22139633362249671900128029132387275539363684188353969065288495002671733200348", - ) - .unwrap(), - Fp::from_str( - "1061056418502836172283188490483332922126033656372467737207927075184389487061", - ) - .unwrap(), - ], - [ - Fp::from_str( - "10241738906190857416046229928455551829189196941239601756375665129874835232299", - ) - .unwrap(), - Fp::from_str( - "27808033332417845112292408673209999320983657696373938259351951416571545364415", - ) - .unwrap(), - Fp::from_str( - "18820154989873674261497645724903918046694142479240549687085662625471577737140", - ) - .unwrap(), - ], - [ - Fp::from_str( - "7983688435214640842673294735439196010654951226956101271763849527529940619307", - ) - .unwrap(), - Fp::from_str( - "17067928657801807648925755556866676899145460770352731818062909643149568271566", - ) - .unwrap(), - Fp::from_str( - "24472070825156236829515738091791182856425635433388202153358580534810244942762", - ) - .unwrap(), - ], - [ - Fp::from_str( - "25752201169361795911258625731016717414310986450004737514595241038036936283227", - ) - .unwrap(), - Fp::from_str( - "26041505376284666160132119888949817249574689146924196064963008712979256107535", - ) - .unwrap(), - Fp::from_str( - "23977050489096115210391718599021827780049209314283111721864956071820102846008", - ) - .unwrap(), - ], - [ - Fp::from_str( - "26678257097278788410676026718736087312816016749016738933942134600725962413805", - ) - .unwrap(), - Fp::from_str( - "10480026985951498884090911619636977502506079971893083605102044931823547311729", - ) - .unwrap(), - Fp::from_str( - "21126631300593007055117122830961273871167754554670317425822083333557535463396", - ) - .unwrap(), - ], - [ - Fp::from_str( - "1564862894215434177641156287699106659379648851457681469848362532131406827573", - ) - .unwrap(), - Fp::from_str( - "13247162472821152334486419054854847522301612781818744556576865965657773174584", - ) - .unwrap(), - Fp::from_str( - "8673615954922496961704442777870253767001276027366984739283715623634850885984", - ) - .unwrap(), - ], - [ - Fp::from_str( - "2794525076937490807476666942602262298677291735723129868457629508555429470085", - ) - .unwrap(), - Fp::from_str( - "4656175953888995612264371467596648522808911819700660048695373348629527757049", - ) - .unwrap(), - Fp::from_str( - "23221574237857660318443567292601561932489621919104226163978909845174616477329", - ) - .unwrap(), - ], - [ - Fp::from_str( - "1878392460078272317716114458784636517603142716091316893054365153068227117145", - ) - .unwrap(), - Fp::from_str( - "2370412714505757731457251173604396662292063533194555369091306667486647634097", - ) - .unwrap(), - Fp::from_str( - "17409784861870189930766639925394191888667317762328427589153989811980152373276", - ) - .unwrap(), - ], - [ - Fp::from_str( - "25869136641898166514111941708608048269584233242773814014385564101168774293194", - ) - .unwrap(), - Fp::from_str( - "11361209360311194794795494027949518465383235799633128250259863567683341091323", - ) - .unwrap(), - Fp::from_str( - "14913258820718821235077379851098720071902170702113538811112331615559409988569", - ) - .unwrap(), - ], - [ - Fp::from_str( - "12957012022018304419868287033513141736995211906682903915897515954290678373899", - ) - .unwrap(), - Fp::from_str( - "17128889547450684566010972445328859295804027707361763477802050112063630550300", - ) - .unwrap(), - Fp::from_str( - "23329219085372232771288306767242735245018143857623151155581182779769305489903", - ) - .unwrap(), - ], - [ - Fp::from_str( - "1607741027962933685476527275858938699728586794398382348454736018784568853937", - ) - .unwrap(), - Fp::from_str( - "2611953825405141009309433982109911976923326848135736099261873796908057448476", - ) - .unwrap(), - Fp::from_str( - "7372230383134982628913227482618052530364724821976589156840317933676130378411", - ) - .unwrap(), - ], - [ - Fp::from_str( - "20203606758501212620842735123770014952499754751430660463060696990317556818571", - ) - .unwrap(), - Fp::from_str( - "4678361398979174017885631008335559529633853759463947250620930343087749944307", - ) - .unwrap(), - Fp::from_str( - "27176462634198471376002287271754121925750749676999036165457559387195124025594", - ) - .unwrap(), - ], - [ - Fp::from_str( - "6361981813552614697928697527332318530502852015189048838072565811230204474643", - ) - .unwrap(), - Fp::from_str( - "13815234633287489023151647353581705241145927054858922281829444557905946323248", - ) - .unwrap(), - Fp::from_str( - "10888828634279127981352133512429657747610298502219125571406085952954136470354", - ) - .unwrap(), - ], - ], - } -} - -/// the fp sponge params -pub fn static_params() -> &'static ArithmeticSpongeParams { - static PARAMS: Lazy> = Lazy::new(make_params); - &PARAMS -} - -pub fn make_fq_params() -> ArithmeticSpongeParams { - ArithmeticSpongeParams { - mds: [ - [ - Fq::from_str( - "28115781186772277486790024060542467295096710153315236019619365740021995624782", - ) - .unwrap(), - Fq::from_str( - "22098002279041163367053200604969603243328318626084412751290336872362628294144", - ) - .unwrap(), - Fq::from_str( - "10518156075882958317589806716220047551309200159506906232124952575033472931386", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8515206633865386306014865142947895502833797732365705727001733785057042819852", - ) - .unwrap(), - Fq::from_str( - "19310731234716792175834594131802557577955166208124819468043130037927500684373", - ) - .unwrap(), - Fq::from_str( - "361439796332338311597104753147071943681730695313819021679602959964518909239", - ) - .unwrap(), - ], - [ - Fq::from_str( - "2193808570710678216879007026210418088296432071066284289131688133644970611483", - ) - .unwrap(), - Fq::from_str( - "1201496953174589855481629688627002262719699487577300614284420648015658009380", - ) - .unwrap(), - Fq::from_str( - "11619800255560837597192574795389782851917036920101027584480912719351481334717", - ) - .unwrap(), - ], - ], - round_constants: [ - [ - Fq::from_str( - "2517640872121921965298496967863234221143680281046699148760560696057284005606", - ) - .unwrap(), - Fq::from_str( - "3391756047431116221709518926936538303706203177575259437741546230828058541679", - ) - .unwrap(), - Fq::from_str( - "28193080211857729746868575888309975056941007202713113547154010421664334143056", - ) - .unwrap(), - ], - [ - Fq::from_str( - "25261619184426186938919514618416881383323154981235406731208902193655587998749", - ) - .unwrap(), - Fq::from_str( - "5438499261516835502981531641588657477212528137520578797088407969732830437134", - ) - .unwrap(), - Fq::from_str( - "1447697894671779324954748568939217281372628544919576009518449387265606369859", - ) - .unwrap(), - ], - [ - Fq::from_str( - "5035532530235542599906399941203951970682478985022204457211063504597080640029", - ) - .unwrap(), - Fq::from_str( - "18548939393800290417015907795270784249198528773378593112394621615021029911007", - ) - .unwrap(), - Fq::from_str( - "28314657632459005492203969796973258399484591559931227050853551342156833947891", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10075465805557971120845970058070916255338843492716768289922460436606689369477", - ) - .unwrap(), - Fq::from_str( - "21985996556868691161386211003270106475915714625334030557267947035839814254081", - ) - .unwrap(), - Fq::from_str( - "9778523497398309788873186849997676949503189428912377745814036481347657299161", - ) - .unwrap(), - ], - [ - Fq::from_str( - "6085447467925843146276340167082679235758707259098174769103982431882228334038", - ) - .unwrap(), - Fq::from_str( - "11214803418623679719680560978819619149235769633101428825693192995405955507848", - ) - .unwrap(), - Fq::from_str( - "20585482519401972421539035665320299097144487427998598740316244173221216198246", - ) - .unwrap(), - ], - [ - Fq::from_str( - "18602266896623204184748247002001496873223612100325866696399863661914256384486", - ) - .unwrap(), - Fq::from_str( - "22165919841309962137671309308234475433816142848229812860682345190836583925843", - ) - .unwrap(), - Fq::from_str( - "22833505632200982123686653495190412951871851216487329681987951602744930627412", - ) - .unwrap(), - ], - [ - Fq::from_str( - "200996541962081036547810490655955282117589336000744078845964972887355639644", - ) - .unwrap(), - Fq::from_str( - "17159390488590225463405148524511348095493761844950655304775985535830170165304", - ) - .unwrap(), - Fq::from_str( - "7519689807382250126180254188667761476713509751388558140260305473388567529705", - ) - .unwrap(), - ], - [ - Fq::from_str( - "14159331841037307097148990917607709903712709092721125605507719995418592745663", - ) - .unwrap(), - Fq::from_str( - "10490695046555645615062072066940833278139280813429718770298136076375411280286", - ) - .unwrap(), - Fq::from_str( - "9996921069626538041923613626115903019578182147993504053879837245826104687293", - ) - .unwrap(), - ], - [ - Fq::from_str( - "28009241574980093348462093077828465154604666812509186537490618830383877236685", - ) - .unwrap(), - Fq::from_str( - "18925279443828804264179873719494108834579217607847079902207023181925588871175", - ) - .unwrap(), - Fq::from_str( - "13126164514615718686767880517156253918404905174962666942976286681458411835722", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1125667389564136291825905670957082668987611691949011617627091942772124917554", - ) - .unwrap(), - Fq::from_str( - "12737072162917928935765906421286553437026542524142430058538254259863452556200", - ) - .unwrap(), - Fq::from_str( - "9855113244149548216327019561589719324434080884827484555441182992249251832158", - ) - .unwrap(), - ], - [ - Fq::from_str( - "6006604346195593001833550983798183088851044846011297061071167569148810544010", - ) - .unwrap(), - Fq::from_str( - "23783465709464699444911580329342599880163107932561352210466223087637763994288", - ) - .unwrap(), - Fq::from_str( - "1581060363083815351710754851350813999229829634252940169154424073664057276774", - ) - .unwrap(), - ], - [ - Fq::from_str( - "24121961545310887440574053281799796355427122479626872394472157625455666323022", - ) - .unwrap(), - Fq::from_str( - "23925781309638869606256007860000699567158045595326122474217734988331349678475", - ) - .unwrap(), - Fq::from_str( - "433512980570318160778040929743715681206456334448542248765142091911433454703", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8080307140515367021419180108267113624095868360927897204642243727009503935719", - ) - .unwrap(), - Fq::from_str( - "13661807750191096117929173962837770733539092996971801228126331071941306856508", - ) - .unwrap(), - Fq::from_str( - "9268394414065063505331314418649987795374055416089324253185088859000252370756", - ) - .unwrap(), - ], - [ - Fq::from_str( - "22374115023493407761095751712373350824513305398485824175669182288521610150311", - ) - .unwrap(), - Fq::from_str( - "22951274634403942446739133926874770994604864227598567536319143390467218980824", - ) - .unwrap(), - Fq::from_str( - "21411532836345163980832919797897483979345524322135010935120723250070247464549", - ) - .unwrap(), - ], - [ - Fq::from_str( - "20688285497159372157224857370703211924056803904697620218749985029000049442943", - ) - .unwrap(), - Fq::from_str( - "8350087190167057556241775495760369408781696125331535735138679647687106863977", - ) - .unwrap(), - Fq::from_str( - "13485893160159637778707269611856683957779710980787754997470728774769162419576", - ) - .unwrap(), - ], - [ - Fq::from_str( - "4621792784192688819920303666439776744566536330750316034321950771579978771021", - ) - .unwrap(), - Fq::from_str( - "13900656491552343190424687336475573267660717627286734246676255663734655019912", - ) - .unwrap(), - Fq::from_str( - "16577037405341365304416318048187907895286388691199320947077947552959834207823", - ) - .unwrap(), - ], - [ - Fq::from_str( - "17453637937712580666297652202332273322112052411250919589546137386514183913993", - ) - .unwrap(), - Fq::from_str( - "9852736110707561006399582579453396957225552488023642073454517393228764176471", - ) - .unwrap(), - Fq::from_str( - "8053970357622019747109700798952789019805031210730923951116580579194625334710", - ) - .unwrap(), - ], - [ - Fq::from_str( - "14566849926060034944494603512439278530775668595134329897253012222562109882008", - ) - .unwrap(), - Fq::from_str( - "8863944349051942080060073891691580009950648437676309749771884964336231381737", - ) - .unwrap(), - Fq::from_str( - "16455762285584757654310476505019438984453107876908065440396394186006196612077", - ) - .unwrap(), - ], - [ - Fq::from_str( - "28098375311516838082882166381119795701982164671360574802728073046992978741339", - ) - .unwrap(), - Fq::from_str( - "13538346067341652694825445642847479918140731375902310280683284825070643960891", - ) - .unwrap(), - Fq::from_str( - "18313412784975078534612748781201087502203257054025866271209086293337241477805", - ) - .unwrap(), - ], - [ - Fq::from_str( - "24807061345703288899043018750567607387907450632666147403804744880717736838940", - ) - .unwrap(), - Fq::from_str( - "16638378638176552952794487891875614248110181610295183306789394461536640085108", - ) - .unwrap(), - Fq::from_str( - "2342874860138849081032934096750004917991517717553229739958552529472431319656", - ) - .unwrap(), - ], - [ - Fq::from_str( - "21631810094765090996871180483650934431972930909326270651252393395613356531282", - ) - .unwrap(), - Fq::from_str( - "2220759912186713489010197903069023809260408491503960321105305330086947471014", - ) - .unwrap(), - Fq::from_str( - "14815764944505758746761442212662459585220143243155504464852948007238083120696", - ) - .unwrap(), - ], - [ - Fq::from_str( - "23947619952183462858644581465494050309407721428302029371055887418452994318961", - ) - .unwrap(), - Fq::from_str( - "25035254658153233628169609451068923631269927394392748023889572264723092874720", - ) - .unwrap(), - Fq::from_str( - "17468020412163678868776493601957969748197290347006692843306595815987772942732", - ) - .unwrap(), - ], - [ - Fq::from_str( - "15262198027618900223004625662874755104828479630165814039838611768431063172994", - ) - .unwrap(), - Fq::from_str( - "25161066724266754383358798644805908588326959881061318668106454787543611445887", - ) - .unwrap(), - Fq::from_str( - "2454250001039770891411267760383268680504653332090622148533496270387793031332", - ) - .unwrap(), - ], - [ - Fq::from_str( - "9171946491887082474979985164918822959719377078284664312866368737511724712644", - ) - .unwrap(), - Fq::from_str( - "6672870238005411132577302023934139592378291207852994424857452575898007687159", - ) - .unwrap(), - Fq::from_str( - "2950400608762766076731526167833938554190979516192019010641815746350334547745", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10653725154501691589476837895400001173933804810435931645261606197625601363132", - ) - .unwrap(), - Fq::from_str( - "12717400214508961810851553873706609743505640660238109459222577386574996883747", - ) - .unwrap(), - Fq::from_str( - "5871058785976817081042949511195036111847495052209270758342334312740290470200", - ) - .unwrap(), - ], - [ - Fq::from_str( - "18192562665205900830717234913238180302424621739145466326708104656354353538015", - ) - .unwrap(), - Fq::from_str( - "19946412409172091711185698839696950657650658896270607012902209489827790455314", - ) - .unwrap(), - Fq::from_str( - "21997416257528392077410699901606794827305154904508120972585193876767785262539", - ) - .unwrap(), - ], - [ - Fq::from_str( - "16525092684784199198745517563091041705366544303388462641935777835264970071331", - ) - .unwrap(), - Fq::from_str( - "27613372589672512522307803997948488817865025374001297632527692577079750053456", - ) - .unwrap(), - Fq::from_str( - "23369674747888778238616865774843237791546925005553032792584302158017141634655", - ) - .unwrap(), - ], - [ - Fq::from_str( - "11012136308159330675912474383855146192700147583104742924419195363346115019405", - ) - .unwrap(), - Fq::from_str( - "20632243971343595216801828590185617698839041744000918292113739726624680548813", - ) - .unwrap(), - Fq::from_str( - "10530371852841765918702282883445676639977895775479854136871270050807595649710", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1610594053831245596683250788274018471388810111366046583216577135605955718023", - ) - .unwrap(), - Fq::from_str( - "452300846172044702598793611907955884294868639769163388132276731316720796255", - ) - .unwrap(), - Fq::from_str( - "22297945145153422883128810575530182077542612397826351322358420927950400316504", - ) - .unwrap(), - ], - [ - Fq::from_str( - "28212510899948152845929142163236606049756849316851154583029383581129293825706", - ) - .unwrap(), - Fq::from_str( - "28325924586146971645663587791728624896861517146549428987043066595915712075981", - ) - .unwrap(), - Fq::from_str( - "23489013325315178311518261165509151135555509351661386106070231815049642443022", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10150108696154604591036176090028652090941375062280095655463112192524823306544", - ) - .unwrap(), - Fq::from_str( - "14935856239824547404885450872472169780177654619496758596151670953532153419587", - ) - .unwrap(), - Fq::from_str( - "4367251608666794961207658726914177158125339342277880902441218521648798930454", - ) - .unwrap(), - ], - [ - Fq::from_str( - "14278046449956534912766622635951826857049583276976844525135170835571509013020", - ) - .unwrap(), - Fq::from_str( - "11627801940273881243235293875277734806211947530882079339115454640100174268255", - ) - .unwrap(), - Fq::from_str( - "22853853581419894582873479603685652928885253184240650995805892818180355600894", - ) - .unwrap(), - ], - [ - Fq::from_str( - "4405193089432137585625363585733613667088817369599257533888439029942466720878", - ) - .unwrap(), - Fq::from_str( - "26434497741746827048559732407319982377645052620918789373329661707603241810667", - ) - .unwrap(), - Fq::from_str( - "23558650878002025381506445692526977061352711282820117441110868042756853707843", - ) - .unwrap(), - ], - [ - Fq::from_str( - "27427423077748345654234924309581695092179468167973406115643356520054395647078", - ) - .unwrap(), - Fq::from_str( - "17585801825757985265979208086560185342609289319992678737491966299829354657891", - ) - .unwrap(), - Fq::from_str( - "22079131836316223121286612953926945430480043835170303484162677394496378207190", - ) - .unwrap(), - ], - [ - Fq::from_str( - "20126865597655889981803452476686954944892814234259869552204215672627920656068", - ) - .unwrap(), - Fq::from_str( - "5591585339015997308682985123056479221565470335707041924016523106405300562835", - ) - .unwrap(), - Fq::from_str( - "9422316572086279209843572429137982927615080330725918371521370800874341571474", - ) - .unwrap(), - ], - [ - Fq::from_str( - "2735677349719528139570614238939713941030373684882307164259316901880218894412", - ) - .unwrap(), - Fq::from_str( - "16229147459127626384090303399894157248853232127961182470501666316464149067069", - ) - .unwrap(), - Fq::from_str( - "17151067888069760812629817914442472623785916486309268828873486698948911058517", - ) - .unwrap(), - ], - [ - Fq::from_str( - "13833972862865550568348750465964022581895521701070662509936215512761615491351", - ) - .unwrap(), - Fq::from_str( - "9624679817699048440664645568701817641311119158936258215534754849666144699339", - ) - .unwrap(), - Fq::from_str( - "10273179847163882031630140477902608240997857384703412878925192706057610103613", - ) - .unwrap(), - ], - [ - Fq::from_str( - "3172037826021850467928085880043492158321918352296515787555947245998877188849", - ) - .unwrap(), - Fq::from_str( - "28890802281119993101506497911757988639840653958256859430239635494708187190915", - ) - .unwrap(), - Fq::from_str( - "23496953773368274731821824281559682992786773767847557735733251263969009271239", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1509044982655321910215442389040863370827049078919961070795919190828975736187", - ) - .unwrap(), - Fq::from_str( - "13927172650979098916742472053302036482743492746437467103459483008024082210879", - ) - .unwrap(), - Fq::from_str( - "17248379591027039069313293591621091031164062825086122980769287846951363066520", - ) - .unwrap(), - ], - [ - Fq::from_str( - "11350333545134487336540967650634077894516131586708748380417042089147896079201", - ) - .unwrap(), - Fq::from_str( - "639497848254405996993150855123515463224731962182127668267769103213580096582", - ) - .unwrap(), - Fq::from_str( - "24528361599642320451530127347946798949257664936307333999618279589325586618880", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8217015496508457685301448884203977810298711070026260090660268003968421268717", - ) - .unwrap(), - Fq::from_str( - "6703444480721420507060701216472376128524677965704475494357937059812166295103", - ) - .unwrap(), - Fq::from_str( - "8051365375874262471960241848873604339195556527603956582828833313772444122472", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10412735174026641936105532807659667596947675372330827493649954160029449767122", - ) - .unwrap(), - Fq::from_str( - "8447576362386697729021229138353952824970707645851763166490398451107606293885", - ) - .unwrap(), - Fq::from_str( - "4802965296970904162106502573136505305073730277702271660292532219583823320181", - ) - .unwrap(), - ], - [ - Fq::from_str( - "3244354881334856885788568976540712586633556478250043997221528214026130052269", - ) - .unwrap(), - Fq::from_str( - "817270901440592571623549787267103386561304980129799240746702119063425010300", - ) - .unwrap(), - Fq::from_str( - "6566338353152134577893356938981496347522747926131278635019050445923229718029", - ) - .unwrap(), - ], - [ - Fq::from_str( - "4854521709622003124815206874897232905514824969466266873443062691298769768277", - ) - .unwrap(), - Fq::from_str( - "12830134034124699064152980183243986699241944691238427861184919962819448276943", - ) - .unwrap(), - Fq::from_str( - "24309439157688106320977023683093060719537142150089588950480669629964661236785", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1853791709949511636795588377016980571084333441972847324139062389997895453872", - ) - .unwrap(), - Fq::from_str( - "11399505004623970417786749745036397690793259153591025248188283534764565207306", - ) - .unwrap(), - Fq::from_str( - "6280235834578097246976697944083887557501831809932305676532914637669922657807", - ) - .unwrap(), - ], - [ - Fq::from_str( - "1516294190187225192808636261678393666537186816904214776860202535671714230097", - ) - .unwrap(), - Fq::from_str( - "5835813607391397757416951433662507638966861369364000865214031356023042341328", - ) - .unwrap(), - Fq::from_str( - "25777313996516799380163546628133415256678997511953860435781885414872422583905", - ) - .unwrap(), - ], - [ - Fq::from_str( - "9749298878960864917089442034293906589697892682402070689770627645324414273893", - ) - .unwrap(), - Fq::from_str( - "19986612197193695239708718365565978831607994386509967951279410162135133793419", - ) - .unwrap(), - Fq::from_str( - "5020585421647265067890838871263925730422335215511670656851726444447972642755", - ) - .unwrap(), - ], - [ - Fq::from_str( - "7256822974971238434100017358319972368738353570339258522235883585691301791128", - ) - .unwrap(), - Fq::from_str( - "9789139064283320903202623693175751994730652446378861671859478926598420184293", - ) - .unwrap(), - Fq::from_str( - "19283468246375057076525422714896652730563534118070235174488237489890270899533", - ) - .unwrap(), - ], - [ - Fq::from_str( - "11487321478704551489982188818171823402443882145686911658585221913500937481156", - ) - .unwrap(), - Fq::from_str( - "16513958012405406860890342996091255867910990589443610357743227675107758695101", - ) - .unwrap(), - Fq::from_str( - "24764429351173766080138047602436205744310671344674490826288279531917797263231", - ) - .unwrap(), - ], - [ - Fq::from_str( - "8256258316375000496541664568891934707113720493937218096466691600593595285909", - ) - .unwrap(), - Fq::from_str( - "26919625894863883593081175799908601863265420311251948374988589188905317081443", - ) - .unwrap(), - Fq::from_str( - "10135851848127171199130812615581006825969108287418884763125596866448544567342", - ) - .unwrap(), - ], - [ - Fq::from_str( - "17567146349912867622479843655652582453162587996421871126612027345809646551661", - ) - .unwrap(), - Fq::from_str( - "2524802431860351616270075327416865184018211992251290134350377936184047953453", - ) - .unwrap(), - Fq::from_str( - "3417609143162661859785838333493682460709943782149216513733553607075915176256", - ) - .unwrap(), - ], - [ - Fq::from_str( - "6906455011502599710165862205505812668908382042647994457156780865092846286493", - ) - .unwrap(), - Fq::from_str( - "21042097659487317081899343674473811663642293019125869396575405454328274948985", - ) - .unwrap(), - Fq::from_str( - "25222370053690749913129090298406788520061040938312366403907461864202905656238", - ) - .unwrap(), - ], - [ - Fq::from_str( - "18933201791079410639949505893100361911334261775545573219434897335758052335005", - ) - .unwrap(), - Fq::from_str( - "14503331557348715387048413780116585195932777696828173626366829282421027153184", - ) - .unwrap(), - Fq::from_str( - "3558781473325529402549318082942465709639711182863041375748599816583729962116", - ) - .unwrap(), - ], - [ - Fq::from_str( - "23932570601084008621895097434501731960424360312878373523779451810455362953625", - ) - .unwrap(), - Fq::from_str( - "13286131463754478912858022007443470896920464302917391606059553157137090717219", - ) - .unwrap(), - Fq::from_str( - "9969435194445819847988134248075866286921574284754991873902788928171429847506", - ) - .unwrap(), - ], - [ - Fq::from_str( - "10821551500865029673311799086099720530496516676117927814621168667836737594374", - ) - .unwrap(), - Fq::from_str( - "57689402905128519605376551862931564078571458212398163192591670282543962941", - ) - .unwrap(), - Fq::from_str( - "4484359679395800410695081358212522306960518636189521201445105538223906998486", - ) - .unwrap(), - ], - ], - } -} - -/// the fp sponge params -pub fn static_fq_params() -> &'static ArithmeticSpongeParams { - static PARAMS: Lazy> = Lazy::new(make_fq_params); - &PARAMS -} - -pub trait SpongeConstants { - const SPONGE_CAPACITY: usize = 1; - const SPONGE_WIDTH: usize = 3; - const SPONGE_RATE: usize = 2; - const PERM_ROUNDS_FULL: usize; - const PERM_ROUNDS_PARTIAL: usize; - const PERM_HALF_ROUNDS_FULL: usize; - const PERM_SBOX: u32; - const PERM_FULL_MDS: bool; - const PERM_INITIAL_ARK: bool; -} - -// #[derive(Clone)] -// pub struct PlonkSpongeConstantsLegacy {} - -// impl SpongeConstants for PlonkSpongeConstantsLegacy { -// const SPONGE_CAPACITY: usize = 1; -// const SPONGE_WIDTH: usize = 3; -// const SPONGE_RATE: usize = 2; -// const PERM_ROUNDS_FULL: usize = 63; -// const PERM_ROUNDS_PARTIAL: usize = 0; -// const PERM_HALF_ROUNDS_FULL: usize = 0; -// const PERM_SBOX: u32 = 5; -// const PERM_FULL_MDS: bool = true; -// const PERM_INITIAL_ARK: bool = true; -// } - -#[derive(Clone)] -pub struct PlonkSpongeConstantsKimchi {} - -impl SpongeConstants for PlonkSpongeConstantsKimchi { - const SPONGE_CAPACITY: usize = 1; - const SPONGE_WIDTH: usize = 3; - const SPONGE_RATE: usize = 2; - const PERM_ROUNDS_FULL: usize = 55; - const PERM_ROUNDS_PARTIAL: usize = 0; - const PERM_HALF_ROUNDS_FULL: usize = 0; - const PERM_SBOX: u32 = 7; - const PERM_FULL_MDS: bool = true; - const PERM_INITIAL_ARK: bool = false; -} - -#[allow(clippy::extra_unused_type_parameters)] -#[inline(never)] -fn apply_mds_matrix( - params: &ArithmeticSpongeParams, - state: &[F], -) -> [F; 3] { - let mut new_state = [F::zero(); 3]; - - for (i, sub_params) in params.mds.iter().enumerate() { - for (state, param) in state.iter().zip(sub_params) { - new_state[i].add_assign(*param * state); - } - } - - new_state -} - -#[inline(never)] -pub fn full_round( - params: &ArithmeticSpongeParams, - state: &mut [F; 3], - r: usize, -) { - for state_i in state.iter_mut() { - *state_i = sbox::(*state_i); - } - *state = apply_mds_matrix::(params, state); - for (i, x) in params.round_constants[r].iter().enumerate() { - state[i].add_assign(x); - } -} - -#[inline(never)] -pub fn poseidon_block_cipher( - params: &ArithmeticSpongeParams, - state: &mut [F; 3], -) { - for r in 0..SC::PERM_ROUNDS_FULL { - full_round::(params, state, r); - } -} - -/// Cryptographic sponge interface - for hashing an arbitrary amount of -/// data into one or more field elements -pub trait Sponge { - /// Create a new cryptographic sponge using arithmetic sponge `params` - fn new(params: &'static ArithmeticSpongeParams) -> Self; - - /// Absorb an array of field elements `x` - fn absorb(&mut self, x: &[Input]); - - /// Squeeze an output from the sponge - fn squeeze(&mut self) -> Digest; - - /// Reset the sponge back to its initial state (as if it were just created) - fn reset(&mut self); -} - -#[inline(never)] -pub fn sbox(mut x: F) -> F { - // Faster than calling x.pow(SC::PERM_SBOX) - let a = x; - for _ in 0..SC::PERM_SBOX - 1 { - x.mul_assign(a); - } - x - - // x.pow([SC::PERM_SBOX as u64]) -} - -#[derive(Clone, Debug)] -pub enum SpongeState { - Absorbed(usize), - Squeezed(usize), -} - -// #[derive(Clone, Serialize, Deserialize, Debug)] -pub struct ArithmeticSpongeParams { - pub round_constants: [[F; 3]; 55], - pub mds: [[F; 3]; 3], - // pub mds: Vec>, -} - -pub trait SpongeParamsForField { - fn get_params() -> &'static ArithmeticSpongeParams; - /// Params from `proof-systems` - /// TODO: Dedup this - fn get_params2() -> &'static mina_poseidon::poseidon::ArithmeticSpongeParams; -} - -impl SpongeParamsForField for Fp { - fn get_params() -> &'static ArithmeticSpongeParams { - static_params() - } - - fn get_params2() -> &'static mina_poseidon::poseidon::ArithmeticSpongeParams { - use mina_poseidon::pasta::fp_kimchi::static_params; - static_params() - } -} - -impl SpongeParamsForField for Fq { - fn get_params() -> &'static ArithmeticSpongeParams { - static_fq_params() - } - - fn get_params2() -> &'static mina_poseidon::poseidon::ArithmeticSpongeParams { - use mina_poseidon::pasta::fq_kimchi::static_params; - static_params() - } -} - -#[derive(Clone)] -pub struct ArithmeticSponge { - pub sponge_state: SpongeState, - rate: usize, - // TODO(mimoo: an array enforcing the width is better no? or at least an assert somewhere) - pub state: [F; 3], - // pub state: Vec, - // tmp_state: Vec>, - params: &'static ArithmeticSpongeParams, - pub constants: std::marker::PhantomData, -} - -impl ArithmeticSponge { - #[inline(never)] - pub fn full_round(&mut self, r: usize) { - full_round::(self.params, &mut self.state, r); - } - - #[inline(never)] - fn poseidon_block_cipher(&mut self) { - poseidon_block_cipher::(self.params, &mut self.state); - } -} - -impl Sponge for ArithmeticSponge { - fn new(params: &'static ArithmeticSpongeParams) -> ArithmeticSponge { - // let capacity = SC::SPONGE_CAPACITY; - let rate = SC::SPONGE_RATE; - - // let mut state = Vec::with_capacity(capacity + rate); - - // for _ in 0..(capacity + rate) { - // state.push(F::zero()); - // } - - // let mut tmp_state = Vec::with_capacity(16); - - ArithmeticSponge { - state: [F::zero(); 3], - rate, - sponge_state: SpongeState::Absorbed(0), - params, - constants: std::marker::PhantomData, - // tmp_state, - } - } - - #[inline(never)] - fn absorb(&mut self, x: &[F]) { - if x.is_empty() { - // Same as the loop below but doesn't add `x` - match self.sponge_state { - SpongeState::Absorbed(n) => { - if n == self.rate { - self.poseidon_block_cipher(); - self.sponge_state = SpongeState::Absorbed(1); - } else { - self.sponge_state = SpongeState::Absorbed(n + 1); - } - } - SpongeState::Squeezed(_n) => { - self.sponge_state = SpongeState::Absorbed(1); - } - } - return; - } - for x in x.iter() { - match self.sponge_state { - SpongeState::Absorbed(n) => { - if n == self.rate { - self.poseidon_block_cipher(); - self.sponge_state = SpongeState::Absorbed(1); - self.state[0].add_assign(x); - } else { - self.sponge_state = SpongeState::Absorbed(n + 1); - self.state[n].add_assign(x); - } - } - SpongeState::Squeezed(_n) => { - self.state[0].add_assign(x); - self.sponge_state = SpongeState::Absorbed(1); - } - } - } - } - - #[inline(never)] - fn squeeze(&mut self) -> F { - // assert_eq!(self.state.len(), 3); - // elog!("NSTATE={:?}", self.state.len()); - match self.sponge_state { - SpongeState::Squeezed(n) => { - if n == self.rate { - self.poseidon_block_cipher(); - self.sponge_state = SpongeState::Squeezed(1); - self.state[0] - } else { - self.sponge_state = SpongeState::Squeezed(n + 1); - self.state[n] - } - } - SpongeState::Absorbed(_n) => { - self.poseidon_block_cipher(); - self.sponge_state = SpongeState::Squeezed(1); - self.state[0] - } - } - } - - fn reset(&mut self) { - todo!() - // self.state = vec![F::zero(); self.state.len()]; - // self.sponge_state = SpongeState::Absorbed(0); - } -} diff --git a/ledger/src/proofs/field.rs b/ledger/src/proofs/field.rs index c821185663..2588b007ae 100644 --- a/ledger/src/proofs/field.rs +++ b/ledger/src/proofs/field.rs @@ -12,7 +12,7 @@ use mina_curves::pasta::{ use mina_hasher::Fp; use mina_poseidon::{constants::PlonkSpongeConstantsKimchi, sponge::DefaultFqSponge}; -use crate::SpongeParamsForField; +use poseidon::SpongeParamsForField; use super::{ public_input::plonk_checks::{self, ShiftedValue}, diff --git a/ledger/src/proofs/opt_sponge.rs b/ledger/src/proofs/opt_sponge.rs index 20596c0b1e..fea9f1692e 100644 --- a/ledger/src/proofs/opt_sponge.rs +++ b/ledger/src/proofs/opt_sponge.rs @@ -1,4 +1,4 @@ -use crate::ArithmeticSpongeParams; +use poseidon::ArithmeticSpongeParams; use super::{ field::{field, Boolean, CircuitVar, FieldWitness}, @@ -48,13 +48,13 @@ impl OptSponge { } = sponge; match sponge_state { - mina_poseidon::poseidon::SpongeState::Squeezed(n) => Self { + ::poseidon::SpongeState::Squeezed(n) => Self { state, params: F::get_params(), needs_final_permute_if_empty: true, sponge_state: SpongeState::Squeezed(n), }, - mina_poseidon::poseidon::SpongeState::Absorbed(n) => { + ::poseidon::SpongeState::Absorbed(n) => { let abs = |i: Boolean| Self { state, params: F::get_params(), diff --git a/ledger/src/proofs/step.rs b/ledger/src/proofs/step.rs index 0ab038072f..efb9637568 100644 --- a/ledger/src/proofs/step.rs +++ b/ledger/src/proofs/step.rs @@ -16,7 +16,6 @@ use crate::{ }, }, verifier::{get_srs, get_srs_mut}, - SpongeParamsForField, }; use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, One, Zero}; use ark_poly::{ @@ -682,7 +681,7 @@ pub mod step_verifier { sponge.absorb(zeta_omega, w); // TODO: Does it panic in OCaml ? - use mina_poseidon::poseidon::SpongeState::{Absorbed, Squeezed}; + use ::poseidon::SpongeState::{Absorbed, Squeezed}; match (sponge_state_before, &sponge.sponge_state) { (Absorbed(x), Absorbed(y)) => assert_eq!(x, *y), (Squeezed(x), Squeezed(y)) => assert_eq!(x, *y), @@ -2011,19 +2010,14 @@ pub fn expand_deferred(params: ExpandDeferredParams) -> Result::new( - crate::static_params(), - ); + let mut sponge = poseidon::ArithmeticSponge::::new(); for old_bulletproof_challenges in &old_bulletproof_challenges { sponge.absorb(old_bulletproof_challenges); } sponge.squeeze() }; - use mina_poseidon::FqSponge; - - let mut sponge = ::FqSponge::new(Fp::get_params2()); + let mut sponge = poseidon::FqSponge::new(); sponge.absorb_fq(&[four_u64_to_field( &proof_state.sponge_digest_before_evaluations, )?]); @@ -2035,10 +2029,10 @@ pub fn expand_deferred(params: ExpandDeferredParams) -> Result Result) -> Self { + pub fn new_with_state_params( + state: [F; 3], + params: &'static ArithmeticSpongeParams, + ) -> Self { Self { state, sponge_state: SpongeState::Absorbed(0), @@ -1712,8 +1716,12 @@ pub mod poseidon { } } + pub fn new_with_state(state: [F; 3]) -> Self { + Self::new_with_state_params(state, F::get_params()) + } + pub fn new() -> Self { - Self::new_with_state([F::zero(); 3], F::get_params2()) + Self::new_with_state([F::zero(); 3]) } fn absorb_empty(&mut self, w: &mut Witness) { @@ -2561,22 +2569,21 @@ pub mod transaction_snark { } pub fn checked_legacy_hash(param: &str, inputs: LegacyInput, w: &mut Witness) -> Fp { - use mina_poseidon::constants::PlonkSpongeConstantsLegacy as Constants; - use mina_poseidon::pasta::fp_legacy::static_params; + use ::poseidon::fp_legacy::params; + use ::poseidon::PlonkSpongeConstantsLegacy as Constants; // We hash the parameter first, without introducing values to the witness let initial_state: [Fp; 3] = { - use mina_poseidon::poseidon::ArithmeticSponge; - use mina_poseidon::poseidon::Sponge; + use ::poseidon::ArithmeticSponge; - let mut sponge = ArithmeticSponge::::new(static_params()); + let mut sponge = ArithmeticSponge::::new_with_params(params()); sponge.absorb(&[crate::param_to_field(param)]); sponge.squeeze(); - sponge.state.try_into().unwrap() + sponge.state }; let mut sponge = - poseidon::Sponge::::new_with_state(initial_state, static_params()); + poseidon::Sponge::::new_with_state_params(initial_state, params()); sponge.absorb(&inputs.to_fields(), w); sponge.squeeze(w) } @@ -2584,10 +2591,10 @@ pub mod transaction_snark { pub fn checked_hash(param: &str, inputs: &[Fp], w: &mut Witness) -> Fp { // We hash the parameter first, without introducing values to the witness let initial_state: [Fp; 3] = { - use crate::{param_to_field, ArithmeticSponge, PlonkSpongeConstantsKimchi, Sponge}; + use crate::param_to_field; + use ::poseidon::ArithmeticSponge; - let mut sponge = - ArithmeticSponge::::new(Fp::get_params()); + let mut sponge = ArithmeticSponge::::new(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); sponge.state @@ -2595,7 +2602,7 @@ pub mod transaction_snark { // dbg!(inputs); - let mut sponge = poseidon::Sponge::::new_with_state(initial_state, Fp::get_params2()); + let mut sponge = poseidon::Sponge::::new_with_state(initial_state); sponge.absorb(inputs, w); sponge.squeeze(w) } @@ -2603,16 +2610,16 @@ pub mod transaction_snark { pub fn checked_hash3(param: &str, inputs: &[Fp], w: &mut Witness) -> Fp { // We hash the parameter first, without introducing values to the witness let initial_state: [Fp; 3] = { - use crate::{param_to_field, ArithmeticSponge, PlonkSpongeConstantsKimchi, Sponge}; + use crate::param_to_field; + use ::poseidon::ArithmeticSponge; - let mut sponge = - ArithmeticSponge::::new(Fp::get_params()); + let mut sponge = ArithmeticSponge::::new(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); sponge.state }; - let mut sponge = poseidon::Sponge::::new_with_state(initial_state, Fp::get_params2()); + let mut sponge = poseidon::Sponge::::new_with_state(initial_state); sponge.absorb3(inputs, w); sponge.squeeze(w) } diff --git a/ledger/src/proofs/wrap.rs b/ledger/src/proofs/wrap.rs index 13fbf620c7..ff0bc22868 100644 --- a/ledger/src/proofs/wrap.rs +++ b/ledger/src/proofs/wrap.rs @@ -2429,14 +2429,13 @@ pub mod wrap_verifier { let mut sponge = { use crate::proofs::opt_sponge::SpongeState as OptSpongeState; - use mina_poseidon::pasta::fq_kimchi::static_params; - use mina_poseidon::poseidon::SpongeState; + use ::poseidon::SpongeState; let OptSpongeState::Squeezed(n_squeezed) = sponge.sponge_state else { // We just called `sample_scalar` panic!("OCaml panics too") }; - let mut sponge = Sponge::::new_with_state(sponge.state, static_params()); + let mut sponge = Sponge::::new_with_state(sponge.state); sponge.sponge_state = SpongeState::Squeezed(n_squeezed); sponge }; diff --git a/poseidon/Cargo.toml b/poseidon/Cargo.toml new file mode 100644 index 0000000000..9e24702e56 --- /dev/null +++ b/poseidon/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "poseidon" +version = "0.1.0" +edition = "2021" + +[lints] +workspace = true + +[dependencies] +mina-curves = { workspace = true } +once_cell = "1" +ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std" ] } diff --git a/poseidon/src/lib.rs b/poseidon/src/lib.rs new file mode 100644 index 0000000000..a736616b49 --- /dev/null +++ b/poseidon/src/lib.rs @@ -0,0 +1,280 @@ +use std::marker::PhantomData; + +use ark_ff::{BigInteger256, Field}; +use mina_curves::pasta::{Fp, Fq}; + +mod params; + +pub use params::*; + +pub trait SpongeConstants { + const SPONGE_CAPACITY: usize = 1; + const SPONGE_WIDTH: usize = 3; + const SPONGE_RATE: usize = 2; + const PERM_ROUNDS_FULL: usize; + const PERM_ROUNDS_PARTIAL: usize; + const PERM_HALF_ROUNDS_FULL: usize; + const PERM_SBOX: u32; + const PERM_FULL_MDS: bool; + const PERM_INITIAL_ARK: bool; +} + +#[derive(Clone)] +pub struct PlonkSpongeConstantsKimchi {} + +impl SpongeConstants for PlonkSpongeConstantsKimchi { + const SPONGE_CAPACITY: usize = 1; + const SPONGE_WIDTH: usize = 3; + const SPONGE_RATE: usize = 2; + const PERM_ROUNDS_FULL: usize = 55; + const PERM_ROUNDS_PARTIAL: usize = 0; + const PERM_HALF_ROUNDS_FULL: usize = 0; + const PERM_SBOX: u32 = 7; + const PERM_FULL_MDS: bool = true; + const PERM_INITIAL_ARK: bool = false; +} + +#[derive(Clone)] +pub struct PlonkSpongeConstantsLegacy {} + +impl SpongeConstants for PlonkSpongeConstantsLegacy { + const SPONGE_CAPACITY: usize = 1; + const SPONGE_WIDTH: usize = 3; + const SPONGE_RATE: usize = 2; + const PERM_ROUNDS_FULL: usize = 63; + const PERM_ROUNDS_PARTIAL: usize = 0; + const PERM_HALF_ROUNDS_FULL: usize = 0; + const PERM_SBOX: u32 = 5; + const PERM_FULL_MDS: bool = true; + const PERM_INITIAL_ARK: bool = true; +} + +fn apply_mds_matrix( + params: &ArithmeticSpongeParams, + state: &[F], +) -> [F; 3] { + let mut new_state = [F::zero(); 3]; + + for (i, sub_params) in params.mds.iter().enumerate() { + for (state, param) in state.iter().zip(sub_params) { + new_state[i].add_assign(*param * state); + } + } + + new_state +} + +pub fn full_round( + params: &ArithmeticSpongeParams, + state: &mut [F; 3], + r: usize, +) { + for state_i in state.iter_mut() { + *state_i = sbox::(*state_i); + } + *state = apply_mds_matrix::(params, state); + for (i, x) in params.round_constants[r].iter().enumerate() { + state[i].add_assign(x); + } +} + +pub fn poseidon_block_cipher( + params: &ArithmeticSpongeParams, + state: &mut [F; 3], +) { + if SC::PERM_INITIAL_ARK { + for (i, x) in params.round_constants[0].iter().enumerate() { + state[i].add_assign(x); + } + for r in 0..SC::PERM_ROUNDS_FULL { + full_round::(params, state, r + 1); + } + } else { + for r in 0..SC::PERM_ROUNDS_FULL { + full_round::(params, state, r); + } + } +} + +pub fn sbox(mut x: F) -> F { + // Faster than calling x.pow(SC::PERM_SBOX) + + if SC::PERM_SBOX == 7 { + let mut res = x.square(); + res *= x; + let res = res.square(); + res * x + } else { + let a = x; + for _ in 0..SC::PERM_SBOX - 1 { + x.mul_assign(a); + } + x + } + // x.pow([SC::PERM_SBOX as u64]) +} + +#[derive(Clone, Debug)] +pub enum SpongeState { + Absorbed(usize), + Squeezed(usize), +} + +#[derive(Debug)] +pub struct ArithmeticSpongeParams { + pub round_constants: Box<[[F; 3]]>, + pub mds: [[F; 3]; 3], +} + +pub trait SpongeParamsForField { + fn get_params() -> &'static ArithmeticSpongeParams; +} + +impl SpongeParamsForField for Fp { + fn get_params() -> &'static ArithmeticSpongeParams { + fp::params() + } +} + +impl SpongeParamsForField for Fq { + fn get_params() -> &'static ArithmeticSpongeParams { + fq::params() + } +} + +#[derive(Clone)] +pub struct ArithmeticSponge { + pub sponge_state: SpongeState, + rate: usize, + pub state: [F; 3], + params: &'static ArithmeticSpongeParams, + constants: PhantomData, +} + +impl ArithmeticSponge { + pub fn full_round(&mut self, r: usize) { + full_round::(self.params, &mut self.state, r); + } + + fn poseidon_block_cipher(&mut self) { + poseidon_block_cipher::(self.params, &mut self.state); + } +} + +impl, C: SpongeConstants> ArithmeticSponge { + pub fn new_with_params(params: &'static ArithmeticSpongeParams) -> ArithmeticSponge { + ArithmeticSponge { + state: [F::zero(); 3], + rate: C::SPONGE_RATE, + sponge_state: SpongeState::Absorbed(0), + params, + constants: PhantomData, + } + } + + pub fn new() -> ArithmeticSponge { + Self::new_with_params(F::get_params()) + } + + pub fn absorb(&mut self, x: &[F]) { + if x.is_empty() { + // Same as the loop below but doesn't add `x` + match self.sponge_state { + SpongeState::Absorbed(n) => { + if n == self.rate { + self.poseidon_block_cipher(); + self.sponge_state = SpongeState::Absorbed(1); + } else { + self.sponge_state = SpongeState::Absorbed(n + 1); + } + } + SpongeState::Squeezed(_n) => { + self.sponge_state = SpongeState::Absorbed(1); + } + } + return; + } + for x in x.iter() { + match self.sponge_state { + SpongeState::Absorbed(n) => { + if n == self.rate { + self.poseidon_block_cipher(); + self.sponge_state = SpongeState::Absorbed(1); + self.state[0].add_assign(x); + } else { + self.sponge_state = SpongeState::Absorbed(n + 1); + self.state[n].add_assign(x); + } + } + SpongeState::Squeezed(_n) => { + self.state[0].add_assign(x); + self.sponge_state = SpongeState::Absorbed(1); + } + } + } + } + + pub fn squeeze(&mut self) -> F { + // assert_eq!(self.state.len(), 3); + // elog!("NSTATE={:?}", self.state.len()); + match self.sponge_state { + SpongeState::Squeezed(n) => { + if n == self.rate { + self.poseidon_block_cipher(); + self.sponge_state = SpongeState::Squeezed(1); + self.state[0] + } else { + self.sponge_state = SpongeState::Squeezed(n + 1); + self.state[n] + } + } + SpongeState::Absorbed(_n) => { + self.poseidon_block_cipher(); + self.sponge_state = SpongeState::Squeezed(1); + self.state[0] + } + } + } +} + +#[derive(Clone)] +pub struct FqSponge { + sponge: ArithmeticSponge, + // sponge: ArithmeticSponge, + last_squeezed: Vec, +} + +impl + Into> FqSponge { + pub fn new() -> Self { + Self { + sponge: ArithmeticSponge::new(), + last_squeezed: Vec::with_capacity(8), + } + } + + pub fn absorb_fq(&mut self, x: &[F]) { + self.last_squeezed.clear(); + for fe in x { + self.sponge.absorb(&[*fe]) + } + } + + pub fn squeeze_limbs(&mut self) -> [u64; NUM_LIMBS] { + const HIGH_ENTROPY_LIMBS: usize = 2; + + if self.last_squeezed.len() >= NUM_LIMBS { + let limbs = std::array::from_fn(|i| self.last_squeezed[i]); + + let nremains = self.last_squeezed.len() - NUM_LIMBS; + self.last_squeezed.copy_within(NUM_LIMBS.., 0); + self.last_squeezed.truncate(nremains); + + limbs + } else { + let x: BigInteger256 = self.sponge.squeeze().into(); + self.last_squeezed + .extend(&x.as_ref()[0..HIGH_ENTROPY_LIMBS]); + self.squeeze_limbs::() + } + } +} diff --git a/poseidon/src/params.rs b/poseidon/src/params.rs new file mode 100644 index 0000000000..4264402359 --- /dev/null +++ b/poseidon/src/params.rs @@ -0,0 +1,3127 @@ +use std::str::FromStr; + +use mina_curves::pasta::{Fp, Fq}; +use once_cell::sync::Lazy; + +use crate::ArithmeticSpongeParams; + +pub mod fq { + use super::*; + + fn make_params() -> ArithmeticSpongeParams { + ArithmeticSpongeParams { + mds: [ + [ + Fq::from_str( + "28115781186772277486790024060542467295096710153315236019619365740021995624782", + ) + .unwrap(), + Fq::from_str( + "22098002279041163367053200604969603243328318626084412751290336872362628294144", + ) + .unwrap(), + Fq::from_str( + "10518156075882958317589806716220047551309200159506906232124952575033472931386", + ) + .unwrap(), + ], + [ + Fq::from_str( + "8515206633865386306014865142947895502833797732365705727001733785057042819852", + ) + .unwrap(), + Fq::from_str( + "19310731234716792175834594131802557577955166208124819468043130037927500684373", + ) + .unwrap(), + Fq::from_str( + "361439796332338311597104753147071943681730695313819021679602959964518909239", + ) + .unwrap(), + ], + [ + Fq::from_str( + "2193808570710678216879007026210418088296432071066284289131688133644970611483", + ) + .unwrap(), + Fq::from_str( + "1201496953174589855481629688627002262719699487577300614284420648015658009380", + ) + .unwrap(), + Fq::from_str( + "11619800255560837597192574795389782851917036920101027584480912719351481334717", + ) + .unwrap(), + ], + ], + round_constants: Box::new([ + [ + Fq::from_str( + "2517640872121921965298496967863234221143680281046699148760560696057284005606", + ) + .unwrap(), + Fq::from_str( + "3391756047431116221709518926936538303706203177575259437741546230828058541679", + ) + .unwrap(), + Fq::from_str( + "28193080211857729746868575888309975056941007202713113547154010421664334143056", + ) + .unwrap(), + ], + [ + Fq::from_str( + "25261619184426186938919514618416881383323154981235406731208902193655587998749", + ) + .unwrap(), + Fq::from_str( + "5438499261516835502981531641588657477212528137520578797088407969732830437134", + ) + .unwrap(), + Fq::from_str( + "1447697894671779324954748568939217281372628544919576009518449387265606369859", + ) + .unwrap(), + ], + [ + Fq::from_str( + "5035532530235542599906399941203951970682478985022204457211063504597080640029", + ) + .unwrap(), + Fq::from_str( + "18548939393800290417015907795270784249198528773378593112394621615021029911007", + ) + .unwrap(), + Fq::from_str( + "28314657632459005492203969796973258399484591559931227050853551342156833947891", + ) + .unwrap(), + ], + [ + Fq::from_str( + "10075465805557971120845970058070916255338843492716768289922460436606689369477", + ) + .unwrap(), + Fq::from_str( + "21985996556868691161386211003270106475915714625334030557267947035839814254081", + ) + .unwrap(), + Fq::from_str( + "9778523497398309788873186849997676949503189428912377745814036481347657299161", + ) + .unwrap(), + ], + [ + Fq::from_str( + "6085447467925843146276340167082679235758707259098174769103982431882228334038", + ) + .unwrap(), + Fq::from_str( + "11214803418623679719680560978819619149235769633101428825693192995405955507848", + ) + .unwrap(), + Fq::from_str( + "20585482519401972421539035665320299097144487427998598740316244173221216198246", + ) + .unwrap(), + ], + [ + Fq::from_str( + "18602266896623204184748247002001496873223612100325866696399863661914256384486", + ) + .unwrap(), + Fq::from_str( + "22165919841309962137671309308234475433816142848229812860682345190836583925843", + ) + .unwrap(), + Fq::from_str( + "22833505632200982123686653495190412951871851216487329681987951602744930627412", + ) + .unwrap(), + ], + [ + Fq::from_str( + "200996541962081036547810490655955282117589336000744078845964972887355639644", + ) + .unwrap(), + Fq::from_str( + "17159390488590225463405148524511348095493761844950655304775985535830170165304", + ) + .unwrap(), + Fq::from_str( + "7519689807382250126180254188667761476713509751388558140260305473388567529705", + ) + .unwrap(), + ], + [ + Fq::from_str( + "14159331841037307097148990917607709903712709092721125605507719995418592745663", + ) + .unwrap(), + Fq::from_str( + "10490695046555645615062072066940833278139280813429718770298136076375411280286", + ) + .unwrap(), + Fq::from_str( + "9996921069626538041923613626115903019578182147993504053879837245826104687293", + ) + .unwrap(), + ], + [ + Fq::from_str( + "28009241574980093348462093077828465154604666812509186537490618830383877236685", + ) + .unwrap(), + Fq::from_str( + "18925279443828804264179873719494108834579217607847079902207023181925588871175", + ) + .unwrap(), + Fq::from_str( + "13126164514615718686767880517156253918404905174962666942976286681458411835722", + ) + .unwrap(), + ], + [ + Fq::from_str( + "1125667389564136291825905670957082668987611691949011617627091942772124917554", + ) + .unwrap(), + Fq::from_str( + "12737072162917928935765906421286553437026542524142430058538254259863452556200", + ) + .unwrap(), + Fq::from_str( + "9855113244149548216327019561589719324434080884827484555441182992249251832158", + ) + .unwrap(), + ], + [ + Fq::from_str( + "6006604346195593001833550983798183088851044846011297061071167569148810544010", + ) + .unwrap(), + Fq::from_str( + "23783465709464699444911580329342599880163107932561352210466223087637763994288", + ) + .unwrap(), + Fq::from_str( + "1581060363083815351710754851350813999229829634252940169154424073664057276774", + ) + .unwrap(), + ], + [ + Fq::from_str( + "24121961545310887440574053281799796355427122479626872394472157625455666323022", + ) + .unwrap(), + Fq::from_str( + "23925781309638869606256007860000699567158045595326122474217734988331349678475", + ) + .unwrap(), + Fq::from_str( + "433512980570318160778040929743715681206456334448542248765142091911433454703", + ) + .unwrap(), + ], + [ + Fq::from_str( + "8080307140515367021419180108267113624095868360927897204642243727009503935719", + ) + .unwrap(), + Fq::from_str( + "13661807750191096117929173962837770733539092996971801228126331071941306856508", + ) + .unwrap(), + Fq::from_str( + "9268394414065063505331314418649987795374055416089324253185088859000252370756", + ) + .unwrap(), + ], + [ + Fq::from_str( + "22374115023493407761095751712373350824513305398485824175669182288521610150311", + ) + .unwrap(), + Fq::from_str( + "22951274634403942446739133926874770994604864227598567536319143390467218980824", + ) + .unwrap(), + Fq::from_str( + "21411532836345163980832919797897483979345524322135010935120723250070247464549", + ) + .unwrap(), + ], + [ + Fq::from_str( + "20688285497159372157224857370703211924056803904697620218749985029000049442943", + ) + .unwrap(), + Fq::from_str( + "8350087190167057556241775495760369408781696125331535735138679647687106863977", + ) + .unwrap(), + Fq::from_str( + "13485893160159637778707269611856683957779710980787754997470728774769162419576", + ) + .unwrap(), + ], + [ + Fq::from_str( + "4621792784192688819920303666439776744566536330750316034321950771579978771021", + ) + .unwrap(), + Fq::from_str( + "13900656491552343190424687336475573267660717627286734246676255663734655019912", + ) + .unwrap(), + Fq::from_str( + "16577037405341365304416318048187907895286388691199320947077947552959834207823", + ) + .unwrap(), + ], + [ + Fq::from_str( + "17453637937712580666297652202332273322112052411250919589546137386514183913993", + ) + .unwrap(), + Fq::from_str( + "9852736110707561006399582579453396957225552488023642073454517393228764176471", + ) + .unwrap(), + Fq::from_str( + "8053970357622019747109700798952789019805031210730923951116580579194625334710", + ) + .unwrap(), + ], + [ + Fq::from_str( + "14566849926060034944494603512439278530775668595134329897253012222562109882008", + ) + .unwrap(), + Fq::from_str( + "8863944349051942080060073891691580009950648437676309749771884964336231381737", + ) + .unwrap(), + Fq::from_str( + "16455762285584757654310476505019438984453107876908065440396394186006196612077", + ) + .unwrap(), + ], + [ + Fq::from_str( + "28098375311516838082882166381119795701982164671360574802728073046992978741339", + ) + .unwrap(), + Fq::from_str( + "13538346067341652694825445642847479918140731375902310280683284825070643960891", + ) + .unwrap(), + Fq::from_str( + "18313412784975078534612748781201087502203257054025866271209086293337241477805", + ) + .unwrap(), + ], + [ + Fq::from_str( + "24807061345703288899043018750567607387907450632666147403804744880717736838940", + ) + .unwrap(), + Fq::from_str( + "16638378638176552952794487891875614248110181610295183306789394461536640085108", + ) + .unwrap(), + Fq::from_str( + "2342874860138849081032934096750004917991517717553229739958552529472431319656", + ) + .unwrap(), + ], + [ + Fq::from_str( + "21631810094765090996871180483650934431972930909326270651252393395613356531282", + ) + .unwrap(), + Fq::from_str( + "2220759912186713489010197903069023809260408491503960321105305330086947471014", + ) + .unwrap(), + Fq::from_str( + "14815764944505758746761442212662459585220143243155504464852948007238083120696", + ) + .unwrap(), + ], + [ + Fq::from_str( + "23947619952183462858644581465494050309407721428302029371055887418452994318961", + ) + .unwrap(), + Fq::from_str( + "25035254658153233628169609451068923631269927394392748023889572264723092874720", + ) + .unwrap(), + Fq::from_str( + "17468020412163678868776493601957969748197290347006692843306595815987772942732", + ) + .unwrap(), + ], + [ + Fq::from_str( + "15262198027618900223004625662874755104828479630165814039838611768431063172994", + ) + .unwrap(), + Fq::from_str( + "25161066724266754383358798644805908588326959881061318668106454787543611445887", + ) + .unwrap(), + Fq::from_str( + "2454250001039770891411267760383268680504653332090622148533496270387793031332", + ) + .unwrap(), + ], + [ + Fq::from_str( + "9171946491887082474979985164918822959719377078284664312866368737511724712644", + ) + .unwrap(), + Fq::from_str( + "6672870238005411132577302023934139592378291207852994424857452575898007687159", + ) + .unwrap(), + Fq::from_str( + "2950400608762766076731526167833938554190979516192019010641815746350334547745", + ) + .unwrap(), + ], + [ + Fq::from_str( + "10653725154501691589476837895400001173933804810435931645261606197625601363132", + ) + .unwrap(), + Fq::from_str( + "12717400214508961810851553873706609743505640660238109459222577386574996883747", + ) + .unwrap(), + Fq::from_str( + "5871058785976817081042949511195036111847495052209270758342334312740290470200", + ) + .unwrap(), + ], + [ + Fq::from_str( + "18192562665205900830717234913238180302424621739145466326708104656354353538015", + ) + .unwrap(), + Fq::from_str( + "19946412409172091711185698839696950657650658896270607012902209489827790455314", + ) + .unwrap(), + Fq::from_str( + "21997416257528392077410699901606794827305154904508120972585193876767785262539", + ) + .unwrap(), + ], + [ + Fq::from_str( + "16525092684784199198745517563091041705366544303388462641935777835264970071331", + ) + .unwrap(), + Fq::from_str( + "27613372589672512522307803997948488817865025374001297632527692577079750053456", + ) + .unwrap(), + Fq::from_str( + "23369674747888778238616865774843237791546925005553032792584302158017141634655", + ) + .unwrap(), + ], + [ + Fq::from_str( + "11012136308159330675912474383855146192700147583104742924419195363346115019405", + ) + .unwrap(), + Fq::from_str( + "20632243971343595216801828590185617698839041744000918292113739726624680548813", + ) + .unwrap(), + Fq::from_str( + "10530371852841765918702282883445676639977895775479854136871270050807595649710", + ) + .unwrap(), + ], + [ + Fq::from_str( + "1610594053831245596683250788274018471388810111366046583216577135605955718023", + ) + .unwrap(), + Fq::from_str( + "452300846172044702598793611907955884294868639769163388132276731316720796255", + ) + .unwrap(), + Fq::from_str( + "22297945145153422883128810575530182077542612397826351322358420927950400316504", + ) + .unwrap(), + ], + [ + Fq::from_str( + "28212510899948152845929142163236606049756849316851154583029383581129293825706", + ) + .unwrap(), + Fq::from_str( + "28325924586146971645663587791728624896861517146549428987043066595915712075981", + ) + .unwrap(), + Fq::from_str( + "23489013325315178311518261165509151135555509351661386106070231815049642443022", + ) + .unwrap(), + ], + [ + Fq::from_str( + "10150108696154604591036176090028652090941375062280095655463112192524823306544", + ) + .unwrap(), + Fq::from_str( + "14935856239824547404885450872472169780177654619496758596151670953532153419587", + ) + .unwrap(), + Fq::from_str( + "4367251608666794961207658726914177158125339342277880902441218521648798930454", + ) + .unwrap(), + ], + [ + Fq::from_str( + "14278046449956534912766622635951826857049583276976844525135170835571509013020", + ) + .unwrap(), + Fq::from_str( + "11627801940273881243235293875277734806211947530882079339115454640100174268255", + ) + .unwrap(), + Fq::from_str( + "22853853581419894582873479603685652928885253184240650995805892818180355600894", + ) + .unwrap(), + ], + [ + Fq::from_str( + "4405193089432137585625363585733613667088817369599257533888439029942466720878", + ) + .unwrap(), + Fq::from_str( + "26434497741746827048559732407319982377645052620918789373329661707603241810667", + ) + .unwrap(), + Fq::from_str( + "23558650878002025381506445692526977061352711282820117441110868042756853707843", + ) + .unwrap(), + ], + [ + Fq::from_str( + "27427423077748345654234924309581695092179468167973406115643356520054395647078", + ) + .unwrap(), + Fq::from_str( + "17585801825757985265979208086560185342609289319992678737491966299829354657891", + ) + .unwrap(), + Fq::from_str( + "22079131836316223121286612953926945430480043835170303484162677394496378207190", + ) + .unwrap(), + ], + [ + Fq::from_str( + "20126865597655889981803452476686954944892814234259869552204215672627920656068", + ) + .unwrap(), + Fq::from_str( + "5591585339015997308682985123056479221565470335707041924016523106405300562835", + ) + .unwrap(), + Fq::from_str( + "9422316572086279209843572429137982927615080330725918371521370800874341571474", + ) + .unwrap(), + ], + [ + Fq::from_str( + "2735677349719528139570614238939713941030373684882307164259316901880218894412", + ) + .unwrap(), + Fq::from_str( + "16229147459127626384090303399894157248853232127961182470501666316464149067069", + ) + .unwrap(), + Fq::from_str( + "17151067888069760812629817914442472623785916486309268828873486698948911058517", + ) + .unwrap(), + ], + [ + Fq::from_str( + "13833972862865550568348750465964022581895521701070662509936215512761615491351", + ) + .unwrap(), + Fq::from_str( + "9624679817699048440664645568701817641311119158936258215534754849666144699339", + ) + .unwrap(), + Fq::from_str( + "10273179847163882031630140477902608240997857384703412878925192706057610103613", + ) + .unwrap(), + ], + [ + Fq::from_str( + "3172037826021850467928085880043492158321918352296515787555947245998877188849", + ) + .unwrap(), + Fq::from_str( + "28890802281119993101506497911757988639840653958256859430239635494708187190915", + ) + .unwrap(), + Fq::from_str( + "23496953773368274731821824281559682992786773767847557735733251263969009271239", + ) + .unwrap(), + ], + [ + Fq::from_str( + "1509044982655321910215442389040863370827049078919961070795919190828975736187", + ) + .unwrap(), + Fq::from_str( + "13927172650979098916742472053302036482743492746437467103459483008024082210879", + ) + .unwrap(), + Fq::from_str( + "17248379591027039069313293591621091031164062825086122980769287846951363066520", + ) + .unwrap(), + ], + [ + Fq::from_str( + "11350333545134487336540967650634077894516131586708748380417042089147896079201", + ) + .unwrap(), + Fq::from_str( + "639497848254405996993150855123515463224731962182127668267769103213580096582", + ) + .unwrap(), + Fq::from_str( + "24528361599642320451530127347946798949257664936307333999618279589325586618880", + ) + .unwrap(), + ], + [ + Fq::from_str( + "8217015496508457685301448884203977810298711070026260090660268003968421268717", + ) + .unwrap(), + Fq::from_str( + "6703444480721420507060701216472376128524677965704475494357937059812166295103", + ) + .unwrap(), + Fq::from_str( + "8051365375874262471960241848873604339195556527603956582828833313772444122472", + ) + .unwrap(), + ], + [ + Fq::from_str( + "10412735174026641936105532807659667596947675372330827493649954160029449767122", + ) + .unwrap(), + Fq::from_str( + "8447576362386697729021229138353952824970707645851763166490398451107606293885", + ) + .unwrap(), + Fq::from_str( + "4802965296970904162106502573136505305073730277702271660292532219583823320181", + ) + .unwrap(), + ], + [ + Fq::from_str( + "3244354881334856885788568976540712586633556478250043997221528214026130052269", + ) + .unwrap(), + Fq::from_str( + "817270901440592571623549787267103386561304980129799240746702119063425010300", + ) + .unwrap(), + Fq::from_str( + "6566338353152134577893356938981496347522747926131278635019050445923229718029", + ) + .unwrap(), + ], + [ + Fq::from_str( + "4854521709622003124815206874897232905514824969466266873443062691298769768277", + ) + .unwrap(), + Fq::from_str( + "12830134034124699064152980183243986699241944691238427861184919962819448276943", + ) + .unwrap(), + Fq::from_str( + "24309439157688106320977023683093060719537142150089588950480669629964661236785", + ) + .unwrap(), + ], + [ + Fq::from_str( + "1853791709949511636795588377016980571084333441972847324139062389997895453872", + ) + .unwrap(), + Fq::from_str( + "11399505004623970417786749745036397690793259153591025248188283534764565207306", + ) + .unwrap(), + Fq::from_str( + "6280235834578097246976697944083887557501831809932305676532914637669922657807", + ) + .unwrap(), + ], + [ + Fq::from_str( + "1516294190187225192808636261678393666537186816904214776860202535671714230097", + ) + .unwrap(), + Fq::from_str( + "5835813607391397757416951433662507638966861369364000865214031356023042341328", + ) + .unwrap(), + Fq::from_str( + "25777313996516799380163546628133415256678997511953860435781885414872422583905", + ) + .unwrap(), + ], + [ + Fq::from_str( + "9749298878960864917089442034293906589697892682402070689770627645324414273893", + ) + .unwrap(), + Fq::from_str( + "19986612197193695239708718365565978831607994386509967951279410162135133793419", + ) + .unwrap(), + Fq::from_str( + "5020585421647265067890838871263925730422335215511670656851726444447972642755", + ) + .unwrap(), + ], + [ + Fq::from_str( + "7256822974971238434100017358319972368738353570339258522235883585691301791128", + ) + .unwrap(), + Fq::from_str( + "9789139064283320903202623693175751994730652446378861671859478926598420184293", + ) + .unwrap(), + Fq::from_str( + "19283468246375057076525422714896652730563534118070235174488237489890270899533", + ) + .unwrap(), + ], + [ + Fq::from_str( + "11487321478704551489982188818171823402443882145686911658585221913500937481156", + ) + .unwrap(), + Fq::from_str( + "16513958012405406860890342996091255867910990589443610357743227675107758695101", + ) + .unwrap(), + Fq::from_str( + "24764429351173766080138047602436205744310671344674490826288279531917797263231", + ) + .unwrap(), + ], + [ + Fq::from_str( + "8256258316375000496541664568891934707113720493937218096466691600593595285909", + ) + .unwrap(), + Fq::from_str( + "26919625894863883593081175799908601863265420311251948374988589188905317081443", + ) + .unwrap(), + Fq::from_str( + "10135851848127171199130812615581006825969108287418884763125596866448544567342", + ) + .unwrap(), + ], + [ + Fq::from_str( + "17567146349912867622479843655652582453162587996421871126612027345809646551661", + ) + .unwrap(), + Fq::from_str( + "2524802431860351616270075327416865184018211992251290134350377936184047953453", + ) + .unwrap(), + Fq::from_str( + "3417609143162661859785838333493682460709943782149216513733553607075915176256", + ) + .unwrap(), + ], + [ + Fq::from_str( + "6906455011502599710165862205505812668908382042647994457156780865092846286493", + ) + .unwrap(), + Fq::from_str( + "21042097659487317081899343674473811663642293019125869396575405454328274948985", + ) + .unwrap(), + Fq::from_str( + "25222370053690749913129090298406788520061040938312366403907461864202905656238", + ) + .unwrap(), + ], + [ + Fq::from_str( + "18933201791079410639949505893100361911334261775545573219434897335758052335005", + ) + .unwrap(), + Fq::from_str( + "14503331557348715387048413780116585195932777696828173626366829282421027153184", + ) + .unwrap(), + Fq::from_str( + "3558781473325529402549318082942465709639711182863041375748599816583729962116", + ) + .unwrap(), + ], + [ + Fq::from_str( + "23932570601084008621895097434501731960424360312878373523779451810455362953625", + ) + .unwrap(), + Fq::from_str( + "13286131463754478912858022007443470896920464302917391606059553157137090717219", + ) + .unwrap(), + Fq::from_str( + "9969435194445819847988134248075866286921574284754991873902788928171429847506", + ) + .unwrap(), + ], + [ + Fq::from_str( + "10821551500865029673311799086099720530496516676117927814621168667836737594374", + ) + .unwrap(), + Fq::from_str( + "57689402905128519605376551862931564078571458212398163192591670282543962941", + ) + .unwrap(), + Fq::from_str( + "4484359679395800410695081358212522306960518636189521201445105538223906998486", + ) + .unwrap(), + ], + ]), + } + } + + pub fn params() -> &'static ArithmeticSpongeParams { + static PARAMS: Lazy> = Lazy::new(make_params); + &PARAMS + } +} + +pub mod fp { + use super::*; + + fn make_params() -> ArithmeticSpongeParams { + ArithmeticSpongeParams { + mds: [ + [ + Fp::from_str( + "12035446894107573964500871153637039653510326950134440362813193268448863222019", + ) + .unwrap(), + Fp::from_str( + "25461374787957152039031444204194007219326765802730624564074257060397341542093", + ) + .unwrap(), + Fp::from_str( + "27667907157110496066452777015908813333407980290333709698851344970789663080149", + ) + .unwrap(), + ], + [ + Fp::from_str( + "4491931056866994439025447213644536587424785196363427220456343191847333476930", + ) + .unwrap(), + Fp::from_str( + "14743631939509747387607291926699970421064627808101543132147270746750887019919", + ) + .unwrap(), + Fp::from_str( + "9448400033389617131295304336481030167723486090288313334230651810071857784477", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10525578725509990281643336361904863911009900817790387635342941550657754064843", + ) + .unwrap(), + Fp::from_str( + "27437632000253211280915908546961303399777448677029255413769125486614773776695", + ) + .unwrap(), + Fp::from_str( + "27566319851776897085443681456689352477426926500749993803132851225169606086988", + ) + .unwrap(), + ], + ], + + round_constants: Box::new([ + [ + Fp::from_str( + "21155079691556475130150866428468322463125560312786319980770950159250751855431", + ) + .unwrap(), + Fp::from_str( + "16883442198399350202652499677723930673110172289234921799701652810789093522349", + ) + .unwrap(), + Fp::from_str( + "17030687036425314703519085065002231920937594822150793091243263847382891822670", + ) + .unwrap(), + ], + [ + Fp::from_str( + "25216718237129482752721276445368692059997901880654047883630276346421457427360", + ) + .unwrap(), + Fp::from_str( + "9054264347380455706540423067244764093107767235485930776517975315876127782582", + ) + .unwrap(), + Fp::from_str( + "26439087121446593160953570192891907825526260324480347638727375735543609856888", + ) + .unwrap(), + ], + [ + Fp::from_str( + "15251000790817261169639394496851831733819930596125214313084182526610855787494", + ) + .unwrap(), + Fp::from_str( + "10861916012597714684433535077722887124099023163589869801449218212493070551767", + ) + .unwrap(), + Fp::from_str( + "18597653523270601187312528478986388028263730767495975370566527202946430104139", + ) + .unwrap(), + ], + [ + Fp::from_str( + "15831416454198644276563319006805490049460322229057756462580029181847589006611", + ) + .unwrap(), + Fp::from_str( + "15171856919255965617705854914448645702014039524159471542852132430360867202292", + ) + .unwrap(), + Fp::from_str( + "15488495958879593647482715143904752785889816789652405888927117106448507625751", + ) + .unwrap(), + ], + [ + Fp::from_str( + "19039802679983063488134304670998725949842655199289961967801223969839823940152", + ) + .unwrap(), + Fp::from_str( + "4720101937153217036737330058775388037616286510783561045464678919473230044408", + ) + .unwrap(), + Fp::from_str( + "10226318327254973427513859412126640040910264416718766418164893837597674300190", + ) + .unwrap(), + ], + [ + Fp::from_str( + "20878756131129218406920515859235137275859844638301967889441262030146031838819", + ) + .unwrap(), + Fp::from_str( + "7178475685651744631172532830973371642652029385893667810726019303466125436953", + ) + .unwrap(), + Fp::from_str( + "1996970955918516145107673266490486752153434673064635795711751450164177339618", + ) + .unwrap(), + ], + [ + Fp::from_str( + "15205545916434157464929420145756897321482314798910153575340430817222504672630", + ) + .unwrap(), + Fp::from_str( + "25660296961552699573824264215804279051322332899472350724416657386062327210698", + ) + .unwrap(), + Fp::from_str( + "13842611741937412200312851417353455040950878279339067816479233688850376089318", + ) + .unwrap(), + ], + [ + Fp::from_str( + "1383799642177300432144836486981606294838630135265094078921115713566691160459", + ) + .unwrap(), + Fp::from_str( + "1135532281155277588005319334542025976079676424839948500020664227027300010929", + ) + .unwrap(), + Fp::from_str( + "4384117336930380014868572224801371377488688194169758696438185377724744869360", + ) + .unwrap(), + ], + [ + Fp::from_str( + "21725577575710270071808882335900370909424604447083353471892004026180492193649", + ) + .unwrap(), + Fp::from_str( + "676128913284806802699862508051022306366147359505124346651466289788974059668", + ) + .unwrap(), + Fp::from_str( + "25186611339598418732666781049829183886812651492845008333418424746493100589207", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10402240124664763733060094237696964473609580414190944671778761753887884341073", + ) + .unwrap(), + Fp::from_str( + "11918307118590866200687906627767559273324023585642003803337447146531313172441", + ) + .unwrap(), + Fp::from_str( + "16895677254395661024186292503536662354181715337630376909778003268311296637301", + ) + .unwrap(), + ], + [ + Fp::from_str( + "23818602699032741669874498456696325705498383130221297580399035778119213224810", + ) + .unwrap(), + Fp::from_str( + "4285193711150023248690088154344086684336247475445482883105661485741762600154", + ) + .unwrap(), + Fp::from_str( + "19133204443389422404056150665863951250222934590192266371578950735825153238612", + ) + .unwrap(), + ], + [ + Fp::from_str( + "5515589673266504033533906836494002702866463791762187140099560583198974233395", + ) + .unwrap(), + Fp::from_str( + "11830435563729472715615302060564876527985621376031612798386367965451821182352", + ) + .unwrap(), + Fp::from_str( + "7510711479224915247011074129666445216001563200717943545636462819681638560128", + ) + .unwrap(), + ], + [ + Fp::from_str( + "24694843201907722940091503626731830056550128225297370217610328578733387733444", + ) + .unwrap(), + Fp::from_str( + "27361655066973784653563425664091383058914302579694897188019422193564924110528", + ) + .unwrap(), + Fp::from_str( + "21606788186194534241166833954371013788633495786419718955480491478044413102713", + ) + .unwrap(), + ], + [ + Fp::from_str( + "19934060063390905409309407607814787335159021816537006003398035237707924006757", + ) + .unwrap(), + Fp::from_str( + "8495813630060004961768092461554180468161254914257386012937942498774724649553", + ) + .unwrap(), + Fp::from_str( + "27524960680529762202005330464726908693944660961000958842417927307941561848461", + ) + .unwrap(), + ], + [ + Fp::from_str( + "15178481650950399259757805400615635703086255035073919114667254549690862896985", + ) + .unwrap(), + Fp::from_str( + "16164780354695672259791105197274509251141405713012804937107314962551600380870", + ) + .unwrap(), + Fp::from_str( + "10529167793600778056702353412758954281652843049850979705476598375597148191979", + ) + .unwrap(), + ], + [ + Fp::from_str( + "721141070179074082553302896292167103755384741083338957818644728290501449040", + ) + .unwrap(), + Fp::from_str( + "22044408985956234023934090378372374883099115753118261312473550998188148912041", + ) + .unwrap(), + Fp::from_str( + "27068254103241989852888872162525066148367014691482601147536314217249046186315", + ) + .unwrap(), + ], + [ + Fp::from_str( + "3880429241956357176819112098792744584376727450211873998699580893624868748961", + ) + .unwrap(), + Fp::from_str( + "17387097125522937623262508065966749501583017524609697127088211568136333655623", + ) + .unwrap(), + Fp::from_str( + "6256814421247770895467770393029354017922744712896100913895513234184920631289", + ) + .unwrap(), + ], + [ + Fp::from_str( + "2942627347777337187690939671601251987500285937340386328746818861972711408579", + ) + .unwrap(), + Fp::from_str( + "24031654937764287280548628128490074801809101323243546313826173430897408945397", + ) + .unwrap(), + Fp::from_str( + "14401457902976567713827506689641442844921449636054278900045849050301331732143", + ) + .unwrap(), + ], + [ + Fp::from_str( + "20170632877385406450742199836933900257692624353889848352407590794211839130727", + ) + .unwrap(), + Fp::from_str( + "24056496193857444725324410428861722338174099794084586764867109123681727290181", + ) + .unwrap(), + Fp::from_str( + "11257913009612703357266904349759250619633397075667824800196659858304604714965", + ) + .unwrap(), + ], + [ + Fp::from_str( + "22228158921984425749199071461510152694025757871561406897041788037116931009246", + ) + .unwrap(), + Fp::from_str( + "9152163378317846541430311327336774331416267016980485920222768197583559318682", + ) + .unwrap(), + Fp::from_str( + "13906695403538884432896105059360907560653506400343268230130536740148070289175", + ) + .unwrap(), + ], + [ + Fp::from_str( + "7220714562509721437034241786731185291972496952091254931195414855962344025067", + ) + .unwrap(), + Fp::from_str( + "27608867305903811397208862801981345878179337369367554478205559689592889691927", + ) + .unwrap(), + Fp::from_str( + "13288465747219756218882697408422850918209170830515545272152965967042670763153", + ) + .unwrap(), + ], + [ + Fp::from_str( + "8251343892709140154567051772980662609566359215743613773155065627504813327653", + ) + .unwrap(), + Fp::from_str( + "22035238365102171608166944627493632660244312563934708756134297161332908879090", + ) + .unwrap(), + Fp::from_str( + "13560937766273321037807329177749403409731524715067067740487246745322577571823", + ) + .unwrap(), + ], + [ + Fp::from_str( + "21652518608959234550262559135285358020552897349934571164032339186996805408040", + ) + .unwrap(), + Fp::from_str( + "22479086963324173427634460342145551255011746993910136574926173581069603086891", + ) + .unwrap(), + Fp::from_str( + "13676501958531751140966255121288182631772843001727158043704693838707387130095", + ) + .unwrap(), + ], + [ + Fp::from_str( + "5680310394102577950568930199056707827608275306479994663197187031893244826674", + ) + .unwrap(), + Fp::from_str( + "25125360450906166639190392763071557410047335755341060350879819485506243289998", + ) + .unwrap(), + Fp::from_str( + "22659254028501616785029594492374243581602744364859762239504348429834224676676", + ) + .unwrap(), + ], + [ + Fp::from_str( + "23101411405087512171421838856759448177512679869882987631073569441496722536782", + ) + .unwrap(), + Fp::from_str( + "24149774013240355952057123660656464942409328637280437515964899830988178868108", + ) + .unwrap(), + Fp::from_str( + "5782097512368226173095183217893826020351125522160843964147125728530147423065", + ) + .unwrap(), + ], + [ + Fp::from_str( + "13540762114500083869920564649399977644344247485313990448129838910231204868111", + ) + .unwrap(), + Fp::from_str( + "20421637734328811337527547703833013277831804985438407401987624070721139913982", + ) + .unwrap(), + Fp::from_str( + "7742664118615900772129122541139124149525273579639574972380600206383923500701", + ) + .unwrap(), + ], + [ + Fp::from_str( + "1109643801053963021778418773196543643970146666329661268825691230294798976318", + ) + .unwrap(), + Fp::from_str( + "16580663920817053843121063692728699890952505074386761779275436996241901223840", + ) + .unwrap(), + Fp::from_str( + "14638514680222429058240285918830106208025229459346033470787111294847121792366", + ) + .unwrap(), + ], + [ + Fp::from_str( + "17080385857812672649489217965285727739557573467014392822992021264701563205891", + ) + .unwrap(), + Fp::from_str( + "26176268111736737558502775993925696791974738793095023824029827577569530708665", + ) + .unwrap(), + Fp::from_str( + "4382756253392449071896813428140986330161215829425086284611219278674857536001", + ) + .unwrap(), + ], + [ + Fp::from_str( + "13934033814940585315406666445960471293638427404971553891617533231178815348902", + ) + .unwrap(), + Fp::from_str( + "27054912732979753314774418228399230433963143177662848084045249524271046173121", + ) + .unwrap(), + Fp::from_str( + "28916070403698593376490976676534962592542013020010643734621202484860041243391", + ) + .unwrap(), + ], + [ + Fp::from_str( + "24820015636966360150164458094894587765384135259446295278101998130934963922381", + ) + .unwrap(), + Fp::from_str( + "7969535238488580655870884015145760954416088335296905520306227531221721881868", + ) + .unwrap(), + Fp::from_str( + "7690547696740080985104189563436871930607055124031711216224219523236060212249", + ) + .unwrap(), + ], + [ + Fp::from_str( + "9712576468091272384496248353414290908377825697488757134833205246106605867289", + ) + .unwrap(), + Fp::from_str( + "12148698031438398980683630141370402088785182722473169207262735228500190477924", + ) + .unwrap(), + Fp::from_str( + "14359657643133476969781351728574842164124292705609900285041476162075031948227", + ) + .unwrap(), + ], + [ + Fp::from_str( + "23563839965372067275137992801035780013422228997724286060975035719045352435470", + ) + .unwrap(), + Fp::from_str( + "4184634822776323233231956802962638484057536837393405750680645555481330909086", + ) + .unwrap(), + Fp::from_str( + "16249511905185772125762038789038193114431085603985079639889795722501216492487", + ) + .unwrap(), + ], + [ + Fp::from_str( + "11001863048692031559800673473526311616702863826063550559568315794438941516621", + ) + .unwrap(), + Fp::from_str( + "4702354107983530219070178410740869035350641284373933887080161024348425080464", + ) + .unwrap(), + Fp::from_str( + "23751680507533064238793742311430343910720206725883441625894258483004979501613", + ) + .unwrap(), + ], + [ + Fp::from_str( + "28670526516158451470169873496541739545860177757793329093045522432279094518766", + ) + .unwrap(), + Fp::from_str( + "3568312993091537758218792253361873752799472566055209125947589819564395417072", + ) + .unwrap(), + Fp::from_str( + "1819755756343439646550062754332039103654718693246396323207323333948654200950", + ) + .unwrap(), + ], + [ + Fp::from_str( + "5372129954699791301953948907349887257752247843844511069896766784624930478273", + ) + .unwrap(), + Fp::from_str( + "17512156688034945920605615850550150476471921176481039715733979181538491476080", + ) + .unwrap(), + Fp::from_str( + "25777105342317622165159064911913148785971147228777677435200128966844208883059", + ) + .unwrap(), + ], + [ + Fp::from_str( + "25350392006158741749134238306326265756085455157012701586003300872637887157982", + ) + .unwrap(), + Fp::from_str( + "20096724945283767296886159120145376967480397366990493578897615204296873954844", + ) + .unwrap(), + Fp::from_str( + "8063283381910110762785892100479219642751540456251198202214433355775540036851", + ) + .unwrap(), + ], + [ + Fp::from_str( + "4393613870462297385565277757207010824900723217720226130342463666351557475823", + ) + .unwrap(), + Fp::from_str( + "9874972555132910032057499689351411450892722671352476280351715757363137891038", + ) + .unwrap(), + Fp::from_str( + "23590926474329902351439438151596866311245682682435235170001347511997242904868", + ) + .unwrap(), + ], + [ + Fp::from_str( + "17723373371137275859467518615551278584842947963894791032296774955869958211070", + ) + .unwrap(), + Fp::from_str( + "2350345015303336966039836492267992193191479606566494799781846958620636621159", + ) + .unwrap(), + Fp::from_str( + "27755207882790211140683010581856487965587066971982625511152297537534623405016", + ) + .unwrap(), + ], + [ + Fp::from_str( + "6584607987789185408123601849106260907671314994378225066806060862710814193906", + ) + .unwrap(), + Fp::from_str( + "609759108847171587253578490536519506369136135254150754300671591987320319770", + ) + .unwrap(), + Fp::from_str( + "28435187585965602110074342250910608316032945187476441868666714022529803033083", + ) + .unwrap(), + ], + [ + Fp::from_str( + "16016664911651770663938916450245705908287192964254704641717751103464322455303", + ) + .unwrap(), + Fp::from_str( + "17551273293154696089066968171579395800922204266630874071186322718903959339163", + ) + .unwrap(), + Fp::from_str( + "20414195497994754529479032467015716938594722029047207834858832838081413050198", + ) + .unwrap(), + ], + [ + Fp::from_str( + "19773307918850685463180290966774465805537520595602496529624568184993487593855", + ) + .unwrap(), + Fp::from_str( + "24598603838812162820757838364185126333280131847747737533989799467867231166980", + ) + .unwrap(), + Fp::from_str( + "11040972566103463398651864390163813377135738019556270484707889323659789290225", + ) + .unwrap(), + ], + [ + Fp::from_str( + "5189242080957784038860188184443287562488963023922086723850863987437818393811", + ) + .unwrap(), + Fp::from_str( + "1435203288979376557721239239445613396009633263160237764653161500252258220144", + ) + .unwrap(), + Fp::from_str( + "13066591163578079667911016543985168493088721636164837520689376346534152547210", + ) + .unwrap(), + ], + [ + Fp::from_str( + "17345901407013599418148210465150865782628422047458024807490502489711252831342", + ) + .unwrap(), + Fp::from_str( + "22139633362249671900128029132387275539363684188353969065288495002671733200348", + ) + .unwrap(), + Fp::from_str( + "1061056418502836172283188490483332922126033656372467737207927075184389487061", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10241738906190857416046229928455551829189196941239601756375665129874835232299", + ) + .unwrap(), + Fp::from_str( + "27808033332417845112292408673209999320983657696373938259351951416571545364415", + ) + .unwrap(), + Fp::from_str( + "18820154989873674261497645724903918046694142479240549687085662625471577737140", + ) + .unwrap(), + ], + [ + Fp::from_str( + "7983688435214640842673294735439196010654951226956101271763849527529940619307", + ) + .unwrap(), + Fp::from_str( + "17067928657801807648925755556866676899145460770352731818062909643149568271566", + ) + .unwrap(), + Fp::from_str( + "24472070825156236829515738091791182856425635433388202153358580534810244942762", + ) + .unwrap(), + ], + [ + Fp::from_str( + "25752201169361795911258625731016717414310986450004737514595241038036936283227", + ) + .unwrap(), + Fp::from_str( + "26041505376284666160132119888949817249574689146924196064963008712979256107535", + ) + .unwrap(), + Fp::from_str( + "23977050489096115210391718599021827780049209314283111721864956071820102846008", + ) + .unwrap(), + ], + [ + Fp::from_str( + "26678257097278788410676026718736087312816016749016738933942134600725962413805", + ) + .unwrap(), + Fp::from_str( + "10480026985951498884090911619636977502506079971893083605102044931823547311729", + ) + .unwrap(), + Fp::from_str( + "21126631300593007055117122830961273871167754554670317425822083333557535463396", + ) + .unwrap(), + ], + [ + Fp::from_str( + "1564862894215434177641156287699106659379648851457681469848362532131406827573", + ) + .unwrap(), + Fp::from_str( + "13247162472821152334486419054854847522301612781818744556576865965657773174584", + ) + .unwrap(), + Fp::from_str( + "8673615954922496961704442777870253767001276027366984739283715623634850885984", + ) + .unwrap(), + ], + [ + Fp::from_str( + "2794525076937490807476666942602262298677291735723129868457629508555429470085", + ) + .unwrap(), + Fp::from_str( + "4656175953888995612264371467596648522808911819700660048695373348629527757049", + ) + .unwrap(), + Fp::from_str( + "23221574237857660318443567292601561932489621919104226163978909845174616477329", + ) + .unwrap(), + ], + [ + Fp::from_str( + "1878392460078272317716114458784636517603142716091316893054365153068227117145", + ) + .unwrap(), + Fp::from_str( + "2370412714505757731457251173604396662292063533194555369091306667486647634097", + ) + .unwrap(), + Fp::from_str( + "17409784861870189930766639925394191888667317762328427589153989811980152373276", + ) + .unwrap(), + ], + [ + Fp::from_str( + "25869136641898166514111941708608048269584233242773814014385564101168774293194", + ) + .unwrap(), + Fp::from_str( + "11361209360311194794795494027949518465383235799633128250259863567683341091323", + ) + .unwrap(), + Fp::from_str( + "14913258820718821235077379851098720071902170702113538811112331615559409988569", + ) + .unwrap(), + ], + [ + Fp::from_str( + "12957012022018304419868287033513141736995211906682903915897515954290678373899", + ) + .unwrap(), + Fp::from_str( + "17128889547450684566010972445328859295804027707361763477802050112063630550300", + ) + .unwrap(), + Fp::from_str( + "23329219085372232771288306767242735245018143857623151155581182779769305489903", + ) + .unwrap(), + ], + [ + Fp::from_str( + "1607741027962933685476527275858938699728586794398382348454736018784568853937", + ) + .unwrap(), + Fp::from_str( + "2611953825405141009309433982109911976923326848135736099261873796908057448476", + ) + .unwrap(), + Fp::from_str( + "7372230383134982628913227482618052530364724821976589156840317933676130378411", + ) + .unwrap(), + ], + [ + Fp::from_str( + "20203606758501212620842735123770014952499754751430660463060696990317556818571", + ) + .unwrap(), + Fp::from_str( + "4678361398979174017885631008335559529633853759463947250620930343087749944307", + ) + .unwrap(), + Fp::from_str( + "27176462634198471376002287271754121925750749676999036165457559387195124025594", + ) + .unwrap(), + ], + [ + Fp::from_str( + "6361981813552614697928697527332318530502852015189048838072565811230204474643", + ) + .unwrap(), + Fp::from_str( + "13815234633287489023151647353581705241145927054858922281829444557905946323248", + ) + .unwrap(), + Fp::from_str( + "10888828634279127981352133512429657747610298502219125571406085952954136470354", + ) + .unwrap(), + ], + ]), + } + } + + pub fn params() -> &'static ArithmeticSpongeParams { + static PARAMS: Lazy> = Lazy::new(make_params); + &PARAMS + } +} + +pub mod fp_legacy { + use super::*; + + fn make_params() -> ArithmeticSpongeParams { + ArithmeticSpongeParams { + mds: [ + [ + Fp::from_str( + "5328350144166205084223774245058198666309664348635459768305312917086056785354", + ) + .unwrap(), + Fp::from_str( + "15214731724107930304595906373487084110291887262136882623959435918484004667388", + ) + .unwrap(), + Fp::from_str( + "22399519358931858664262538157042328690232277435337286643350379269028878354609", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10086628405675314879458652402278736459294354590428582803795166650930540770072", + ) + .unwrap(), + Fp::from_str( + "17127968360683744052278857147989507037142007029142438136689352416106177192235", + ) + .unwrap(), + Fp::from_str( + "14207324749280135281015658576564097509614634975132487654324863824516044294735", + ) + .unwrap(), + ], + [ + Fp::from_str( + "3059104278162906687184746935153057867173086006783171716838577369156969739687", + ) + .unwrap(), + Fp::from_str( + "16755849208683706534025643823697988418063305979108082130624352443958404325985", + ) + .unwrap(), + Fp::from_str( + "16889774624482628108075965871448623911656600744832339664842346756371603433407", + ) + .unwrap(), + ], + ], + round_constants: Box::new([ + [ + Fp::from_str( + "1346081094044643970582493287085428191977688221215786919106342366360741041016", + ) + .unwrap(), + Fp::from_str( + "10635969173348128974923358283368657934408577270968219574411363948927109531877", + ) + .unwrap(), + Fp::from_str( + "18431955373344919956072236142080066866861234899777299873162413437379924987003", + ) + .unwrap(), + ], + [ + Fp::from_str( + "5797044060651575840084283729791357462720161727701814038830889113712361837236", + ) + .unwrap(), + Fp::from_str( + "931288489507796144596974766082847744938192694315568692730730202141894005205", + ) + .unwrap(), + Fp::from_str( + "13659894470945121760517769979107966886673294523737498361566285362771110125394", + ) + .unwrap(), + ], + [ + Fp::from_str( + "6076231707445968054305995680347976771585015308155855387339303513025362636128", + ) + .unwrap(), + Fp::from_str( + "28822740034050339685362260108484262889265034407340240070058997651710236456303", + ) + .unwrap(), + Fp::from_str( + "23420266473857869790486107029614186913447272961845992963194006142267563993493", + ) + .unwrap(), + ], + [ + Fp::from_str( + "13753917374184785903125509246122783296344288469304898921025291716613575849357", + ) + .unwrap(), + Fp::from_str( + "22396739346703340038555577564698139382745239004673153148674304627904081092826", + ) + .unwrap(), + Fp::from_str( + "13064238335532551154986111986409392866270911640785653458047811526842088084911", + ) + .unwrap(), + ], + [ + Fp::from_str( + "23165923875642452719095776619341762858050322341374771345641255745672274104746", + ) + .unwrap(), + Fp::from_str( + "1876216571769482372914291210815859835162659440705283782713345335434924136736", + ) + .unwrap(), + Fp::from_str( + "25448252060136178247213604035267580231762596830634036926922217427938159849142", + ) + .unwrap(), + ], + [ + Fp::from_str( + "2161875315509206970842862195937323600322108268401381254431163181777726747153", + ) + .unwrap(), + Fp::from_str( + "19159855698625842998331760283165907305622417625829203038229273729196960321630", + ) + .unwrap(), + Fp::from_str( + "24828563875172432296791053766778475681869974948122169083176331088266823626561", + ) + .unwrap(), + ], + [ + Fp::from_str( + "15959479662608710141128458274961057999257961784282074767105536637788386907463", + ) + .unwrap(), + Fp::from_str( + "8006369581283017287449277389162056290714176164680299906116833200510117952858", + ) + .unwrap(), + Fp::from_str( + "18794336794618132129607701188430371953320538976527988886453665523008714542779", + ) + .unwrap(), + ], + [ + Fp::from_str( + "19408271715954593722501381885401160867835377473312521553027032015227895029571", + ) + .unwrap(), + Fp::from_str( + "13654747284005184272412579731446984220568337794941823533879059135026064413631", + ) + .unwrap(), + Fp::from_str( + "14094055032353750931629930778481002727722804310855727808905931659115939920989", + ) + .unwrap(), + ], + [ + Fp::from_str( + "13241818625838429282823260827177433104574315653706102174619924764342778921524", + ) + .unwrap(), + Fp::from_str( + "25709259239494174564705048436260891089407557689981668111890003079561388887725", + ) + .unwrap(), + Fp::from_str( + "26866626910239634723971078462134580196819809568632305020800296809092442642381", + ) + .unwrap(), + ], + [ + Fp::from_str( + "23886826350713085163238005260075062110062681905356997481925492650252417143049", + ) + .unwrap(), + Fp::from_str( + "16853602711255261520713463306790360324679500458440235992292027384928526778856", + ) + .unwrap(), + Fp::from_str( + "18444710386168488194610417945072711530390091945738595259171890487504771614189", + ) + .unwrap(), + ], + [ + Fp::from_str( + "16896789009769903615328691751424474161656500693270070895928499575572871141439", + ) + .unwrap(), + Fp::from_str( + "23842266984616972287898037872537536999393060934879414668030219493005225085992", + ) + .unwrap(), + Fp::from_str( + "24369698563802298585444760814856330583118549706483939267059237951238240608187", + ) + .unwrap(), + ], + [ + Fp::from_str( + "25360195173713628054110426524260405937218170863260484655473435413697869858790", + ) + .unwrap(), + Fp::from_str( + "1486437708678506228822038923353468635394979165769861487132708983207562337116", + ) + .unwrap(), + Fp::from_str( + "18653498960429911228442559598959970807723487073275324556015861725806677047150", + ) + .unwrap(), + ], + [ + Fp::from_str( + "18878179044241268037057256060083772636369783391816038647949347814518015576522", + ) + .unwrap(), + Fp::from_str( + "178715779905629247116805974152863592571182389085419970371289655361443016848", + ) + .unwrap(), + Fp::from_str( + "8381006794425876451998903949255801618132578446062133243427381291481465852184", + ) + .unwrap(), + ], + [ + Fp::from_str( + "4176946262813877719206528849579392120806054050640974718891398605746592169324", + ) + .unwrap(), + Fp::from_str( + "16376345520728802444699629729684297833862527190772376028981704525651968727081", + ) + .unwrap(), + Fp::from_str( + "8399065769082251057361366626601550736334213197703006866551331927128775757919", + ) + .unwrap(), + ], + [ + Fp::from_str( + "15435308585611812393531506745122614542196708285088622615406141986333182280857", + ) + .unwrap(), + Fp::from_str( + "4082259282787276939431186930090898350392871145699460879678141552997816391817", + ) + .unwrap(), + Fp::from_str( + "26348742719959309014730178326877937464605873211235784184917342950648457078699", + ) + .unwrap(), + ], + [ + Fp::from_str( + "9707631711734344681918469569872517425107158187591261754498805460753455298868", + ) + .unwrap(), + Fp::from_str( + "27910768846011709391567916011595957279088224137468948238696800459136335473132", + ) + .unwrap(), + Fp::from_str( + "20407239095656434708569263842372155762970847207558227886302782130015730063802", + ) + .unwrap(), + ], + [ + Fp::from_str( + "22726225412881182965250630589245572283256255052470345984553083359461473893802", + ) + .unwrap(), + Fp::from_str( + "12443967854426795490638709950679156338200426963050610832781263082981525248175", + ) + .unwrap(), + Fp::from_str( + "27102543658848146076219989119639465430524061997280788166887046421706499775415", + ) + .unwrap(), + ], + [ + Fp::from_str( + "14427224233985680214097547669945064793149553513421479297921556194475574770861", + ) + .unwrap(), + Fp::from_str( + "22917454832925781549840198815703114840452733537799472739275668965081704937832", + ) + .unwrap(), + Fp::from_str( + "3455076056123630366063931123762198941796412458154689469887583689725886013901", + ) + .unwrap(), + ], + [ + Fp::from_str( + "4513100023937785913596662867311227004762025658663076805918211014066645403017", + ) + .unwrap(), + Fp::from_str( + "18187619530784075723418065322038024507729605774832001333883311123910954334059", + ) + .unwrap(), + Fp::from_str( + "9447065431426150382325592560406989926365684509675374414068135115024495130938", + ) + .unwrap(), + ], + [ + Fp::from_str( + "3227816098015819796753427754968234889554095489076864339942014527747604603014", + ) + .unwrap(), + Fp::from_str( + "14798316759185072116520458171957899889489461918408669809912344751222514418582", + ) + .unwrap(), + Fp::from_str( + "23013904852315603905843158448056763116188801262838729536210355401378476650033", + ) + .unwrap(), + ], + [ + Fp::from_str( + "20979191509934291452182967564058656088941447895799901211038858159903580333267", + ) + .unwrap(), + Fp::from_str( + "20772973010251235271448378823573767262405703078344288856168565499702414379868", + ) + .unwrap(), + Fp::from_str( + "10105446427739226002497411811738001382334316505480517822035303561899927603685", + ) + .unwrap(), + ], + [ + Fp::from_str( + "11079074761356717003579108002319997196881121172538617046865136940931215263187", + ) + .unwrap(), + Fp::from_str( + "4693927775411489288330326150094711670434597808961717172753867514688725690438", + ) + .unwrap(), + Fp::from_str( + "18581720304902876944842830383273503265470859268712618325357902881821721540119", + ) + .unwrap(), + ], + [ + Fp::from_str( + "3065369948183164725765083504606321683481629263177690053939474679689088169185", + ) + .unwrap(), + Fp::from_str( + "18515622379147081456114962668688706121098539582467584736624699157043365677487", + ) + .unwrap(), + Fp::from_str( + "17563088600719312877716085528177751048248154461245613291986010180187238198006", + ) + .unwrap(), + ], + [ + Fp::from_str( + "26199746176994924146211004840756471702409132230831594954444947705902602287290", + ) + .unwrap(), + Fp::from_str( + "7576136600627345523051497639367002272003104458453478964661395239732811642605", + ) + .unwrap(), + Fp::from_str( + "20058687874612168338994287374025378897088936171250328231848098497610185784281", + ) + .unwrap(), + ], + [ + Fp::from_str( + "16894722532414195606958290526999761110785277556463400588047573469106594850228", + ) + .unwrap(), + Fp::from_str( + "13961730805696859614283621225672002906734926278118993580398533742874863598733", + ) + .unwrap(), + Fp::from_str( + "25256842011135514243352951950573936602906198374305137963222382546140030647211", + ) + .unwrap(), + ], + [ + Fp::from_str( + "18530360047537856737482157200091774590035773602620205695980247565433703032532", + ) + .unwrap(), + Fp::from_str( + "23014819965938599260086897799541446473887833964178378497976832161473586995397", + ) + .unwrap(), + Fp::from_str( + "27911426213258307990762460361663504655967992659180759140364181941291843542489", + ) + .unwrap(), + ], + [ + Fp::from_str( + "1067338118323302017358103178057182291035336430305886255160210378977812067042", + ) + .unwrap(), + Fp::from_str( + "17219092885519007424608854460610388434712113621163885775309496940189894433620", + ) + .unwrap(), + Fp::from_str( + "16432921127615937542183846559291144733339643093361323334499888895135356545408", + ) + .unwrap(), + ], + [ + Fp::from_str( + "28608851042959977114787048070153637607786033079364369200270218128830983558707", + ) + .unwrap(), + Fp::from_str( + "10121629780013165888398831090128011045011860641816380162950736555305748332191", + ) + .unwrap(), + Fp::from_str( + "2348036340843128746981122630521268144839343500596932561106759754644596320722", + ) + .unwrap(), + ], + [ + Fp::from_str( + "16619881370356823200358060093334065394764987467483650323706184068451904156452", + ) + .unwrap(), + Fp::from_str( + "2302436627861989749837563733434625231689351276818486757748445924305258835336", + ) + .unwrap(), + Fp::from_str( + "27514536540953539473280001431110316405453388911725550380123851609652679788049", + ) + .unwrap(), + ], + [ + Fp::from_str( + "9459277727420672604737117687200019308525004979918488827092207438664125039815", + ) + .unwrap(), + Fp::from_str( + "23425670740358068509956137586663046763224562225383386726193078231034380596217", + ) + .unwrap(), + Fp::from_str( + "7641885067011661443791509688937280323563328029517832788240965464798835873658", + ) + .unwrap(), + ], + [ + Fp::from_str( + "9579420382351699601929202663836555665702024548386778299996961509578687980280", + ) + .unwrap(), + Fp::from_str( + "18513671386572584282611234979588379470994484682444053600751415262497237017703", + ) + .unwrap(), + Fp::from_str( + "24923151431234706142737221165378041700050312199585085101919834422744926421604", + ) + .unwrap(), + ], + [ + Fp::from_str( + "21131320841803068139502705966375283830095161079635803028011171241658723560073", + ) + .unwrap(), + Fp::from_str( + "19208476595309656066589572658712717685014329237892885950958199953675225096566", + ) + .unwrap(), + Fp::from_str( + "24023185216737416080949689106968568821656545490748664446389634158498624398204", + ) + .unwrap(), + ], + [ + Fp::from_str( + "7510552996848634969347937904645640209946785877619890235458182993413526028718", + ) + .unwrap(), + Fp::from_str( + "3694415017252995094553868781762548289196990492336482360084813900937464847638", + ) + .unwrap(), + Fp::from_str( + "9219021070107873028263141554048987416559034633883158827414043929220388719352", + ) + .unwrap(), + ], + [ + Fp::from_str( + "5058327241234443421111591959922712922949620710493120384930391763032694640881", + ) + .unwrap(), + Fp::from_str( + "13148252221647574076185511663661016015859769210867362839817254885265598775418", + ) + .unwrap(), + Fp::from_str( + "15186790492457240277904880519227706403545816456632095870015828239411033220638", + ) + .unwrap(), + ], + [ + Fp::from_str( + "2775942914650502409705888572245750999561427024488403026572311267798009048466", + ) + .unwrap(), + Fp::from_str( + "6277965230841030155341171319927732572492215818164736949144854827643964384893", + ) + .unwrap(), + Fp::from_str( + "24144742149845235561087977558785057713814731737434473021812189457617252043745", + ) + .unwrap(), + ], + [ + Fp::from_str( + "25789129719327437503403457598813971826156253950521984610569937361506914183550", + ) + .unwrap(), + Fp::from_str( + "21500534320778995945845999974779950304491968082325255355181901574840373597824", + ) + .unwrap(), + Fp::from_str( + "17185359848218837018503091932245529880546896465437232425673134558221638601375", + ) + .unwrap(), + ], + [ + Fp::from_str( + "12253896579078110143384981818031883112606762215016553811786428215758384195713", + ) + .unwrap(), + Fp::from_str( + "12956658260778456372481429232709881794962204180363200699121804724437678625542", + ) + .unwrap(), + Fp::from_str( + "3023603786717368708677300377055384474816569333060487675635618249403832078921", + ) + .unwrap(), + ], + [ + Fp::from_str( + "4186492855716808019562789862833898284927736051002588766326482010810259565130", + ) + .unwrap(), + Fp::from_str( + "4263939782228419774639068267872291539552889472311225829898746091327730032923", + ) + .unwrap(), + Fp::from_str( + "24068843626280451423530509388397151179174104901782990365720205643492047328816", + ) + .unwrap(), + ], + [ + Fp::from_str( + "14564937827374621319716285527475223392664010281568256859627186463065876537730", + ) + .unwrap(), + Fp::from_str( + "28367596550218705971881480694115935470211319172596432472834880507822452927283", + ) + .unwrap(), + Fp::from_str( + "28712267437482356021504544448225827500268648754270274754623969882031853409874", + ) + .unwrap(), + ], + [ + Fp::from_str( + "4542596163006916397403529184431773692747461300288194722982487051249951403191", + ) + .unwrap(), + Fp::from_str( + "2530461821259252672899452671728393208543894014761816288817584587718369998371", + ) + .unwrap(), + Fp::from_str( + "12886393063011539390567049190923398676964700147222878509238966758839020897414", + ) + .unwrap(), + ], + [ + Fp::from_str( + "21593897590707514492037699253654745501762191795293908682495110982956631870528", + ) + .unwrap(), + Fp::from_str( + "13233005790593128135480716846773978578237145313006994631606474472023504621256", + ) + .unwrap(), + Fp::from_str( + "21621863098292803642478350494794106282518362577273973885587684567452726939909", + ) + .unwrap(), + ], + [ + Fp::from_str( + "26068620073001644720969640099644251616742620988609091568084348314770436291745", + ) + .unwrap(), + Fp::from_str( + "18248589586787935500122854210401321966459127818593446990365211078521058875685", + ) + .unwrap(), + Fp::from_str( + "21247134484403265289037859533347798468858819117600251067578809852124865474448", + ) + .unwrap(), + ], + [ + Fp::from_str( + "7947383127165915366383984718363902897504221803836013123394785749404572432524", + ) + .unwrap(), + Fp::from_str( + "22173041014621867335598230447618036223462011647696367239478182269973488867154", + ) + .unwrap(), + Fp::from_str( + "16773227734018849308448505860847939069870370055633571816925675705713088305139", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10708707957340055662073314227607620808612686977606082605219160019699644826999", + ) + .unwrap(), + Fp::from_str( + "21249897193797038261479589555720746994050836195265348846222835266344091683000", + ) + .unwrap(), + Fp::from_str( + "12581195059139097540117398803363514148192715293133623516709277290477633379593", + ) + .unwrap(), + ], + [ + Fp::from_str( + "19779599816866992123290302397082614570282926215253589712189610064229996603178", + ) + .unwrap(), + Fp::from_str( + "21749216503901548676985371189807470207364320167486559936962401093285243029177", + ) + .unwrap(), + Fp::from_str( + "17600045923623503357380202389718735904174992978547372448837488832457719009224", + ) + .unwrap(), + ], + [ + Fp::from_str( + "2732872979548118117758016335601225525660858727422778256671975055129965858636", + ) + .unwrap(), + Fp::from_str( + "13703031005128062046175331918702218558750713240446179585947851411173844703597", + ) + .unwrap(), + Fp::from_str( + "28447710105386636841938034820015573492556750872924193415447818187228356409281", + ) + .unwrap(), + ], + [ + Fp::from_str( + "28539960355005748517007309210788803416171161412204526246799800716567376494244", + ) + .unwrap(), + Fp::from_str( + "21329318452221893900731030722137844458345358926323127858742388587761302609863", + ) + .unwrap(), + Fp::from_str( + "28135302149599894709369178097439582767613940517471323224020113411362601191873", + ) + .unwrap(), + ], + [ + Fp::from_str( + "24980774120400248734054527936006392540889095705961960837980443629260392758683", + ) + .unwrap(), + Fp::from_str( + "20339911045808632098936066397942175169549806052128535543540543556255197716643", + ) + .unwrap(), + Fp::from_str( + "7929293103930252545581851978492699598413941396422930641071359388697302362494", + ) + .unwrap(), + ], + [ + Fp::from_str( + "8911092207145893152276662096451247820054843777071569723455408545101628926203", + ) + .unwrap(), + Fp::from_str( + "19648860643145256523615441075182036100116634560394529500146405733687718224516", + ) + .unwrap(), + Fp::from_str( + "14635387208623683806428528837466762532853903031263830054986064902455379735903", + ) + .unwrap(), + ], + [ + Fp::from_str( + "11555212214346132926966321609673228184079851030522218543981385635403167028692", + ) + .unwrap(), + Fp::from_str( + "20896918157639814425520058178561910811657326967880217845710779511927814874973", + ) + .unwrap(), + Fp::from_str( + "4650158165912007049140499755153804318686705949436165235742106170124284287326", + ) + .unwrap(), + ], + [ + Fp::from_str( + "13880660273492757167295696447853232191657893303250187467329180558670697369810", + ) + .unwrap(), + Fp::from_str( + "8043529172463774320604378774840863923445982272478964686447801046272917236836", + ) + .unwrap(), + Fp::from_str( + "2134399296482715903442913099374581981696436050603410080564843555725771329441", + ) + .unwrap(), + ], + [ + Fp::from_str( + "27320952903412641133501507962185246982787769547770982814240701526492601978122", + ) + .unwrap(), + Fp::from_str( + "23417491374379751329394424924400186404791519133465537872457405970098902747611", + ) + .unwrap(), + Fp::from_str( + "17612427354278346772575179176139417348059847375297761006336024476146551185903", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10710998507064742997612080847223278109404482930427999113323732519626499166548", + ) + .unwrap(), + Fp::from_str( + "14958094513415797513745395709487730603918953350067504982704138489305723550923", + ) + .unwrap(), + Fp::from_str( + "24096319595904213497633343966229498735553590589105811393277073274927955202995", + ) + .unwrap(), + ], + [ + Fp::from_str( + "17983724131200292654039765185049138356840415443160477259330748730019147254309", + ) + .unwrap(), + Fp::from_str( + "17598096800487588874709548646068838880468456205252324677357706597166777506441", + ) + .unwrap(), + Fp::from_str( + "27420647821110229619898200875848631488422182349567475956209153112306555222281", + ) + .unwrap(), + ], + [ + Fp::from_str( + "448538544835457571662601142415301047108854812427100562339376187510452313026", + ) + .unwrap(), + Fp::from_str( + "23494184556634922103535803143214434479598067155171780264810485708203176455201", + ) + .unwrap(), + Fp::from_str( + "22626342941879801989161990529511235538216563009907378573817996229389756621777", + ) + .unwrap(), + ], + [ + Fp::from_str( + "26128268137723417163973860961686381960826033145738852158792607959175787222856", + ) + .unwrap(), + Fp::from_str( + "20225791828042873305317281581105429726352058325970107209484198122707862156597", + ) + .unwrap(), + Fp::from_str( + "7538871133759632802857159609785118198934349221046986784429069814655215585732", + ) + .unwrap(), + ], + [ + Fp::from_str( + "26184554861259642274153262777073624024579929401668865520166966302070394487366", + ) + .unwrap(), + Fp::from_str( + "28755259264665180745537307265993667261709206143628938749669440804401623257679", + ) + .unwrap(), + Fp::from_str( + "11896066093033549470312328497237649508068258723531931099214795928200015717321", + ) + .unwrap(), + ], + [ + Fp::from_str( + "21657721599978732693249012287058163532690942515202465984736373311077240614059", + ) + .unwrap(), + Fp::from_str( + "9214914097169852704753116653702415951907628005986883140609006971322091003693", + ) + .unwrap(), + Fp::from_str( + "18710111680849814325169297240208687402588261569152088592693815711857504371037", + ) + .unwrap(), + ], + [ + Fp::from_str( + "6813635166770764528979084175325709935892248249948967889926276426090222296643", + ) + .unwrap(), + Fp::from_str( + "20546585456429436268067726231902751119458200511988152296570567167520382569278", + ) + .unwrap(), + Fp::from_str( + "20087466019194902429054761607398988292568594301671509779549344754172952693871", + ) + .unwrap(), + ], + [ + Fp::from_str( + "28185105286740691904534067831357491310995891986363455251895371651360605333143", + ) + .unwrap(), + Fp::from_str( + "10108348212894231193041286244259038275269464277821588425688314560368589986063", + ) + .unwrap(), + Fp::from_str( + "11433633215392393209829215018579238412423821563056156785641278458497271271546", + ) + .unwrap(), + ], + [ + Fp::from_str( + "27870881917195016999862550657996865268956893566432995492427618003637597051321", + ) + .unwrap(), + Fp::from_str( + "102309803677783876701097881491240456320211833502658383473112057006867019389", + ) + .unwrap(), + Fp::from_str( + "22844040227595875612525628393174357057929113317578127744718774517498324646590", + ) + .unwrap(), + ], + [ + Fp::from_str( + "18364790233947478619325319418813215212267974311771564959136180502266118026133", + ) + .unwrap(), + Fp::from_str( + "2480624341921718230432383518425561514824501138863702825916674641657321180841", + ) + .unwrap(), + Fp::from_str( + "16778939567530361665956758171503829349658551798564323167725356065198936433124", + ) + .unwrap(), + ], + [ + Fp::from_str( + "11947564511486966895926950599696532964589539443187518177489990556481125699966", + ) + .unwrap(), + Fp::from_str( + "3133187646540385483015602955087323554103587039123577645562801570574691666057", + ) + .unwrap(), + Fp::from_str( + "27704797101265438206569218421707753788081674727344603874614391656565567951541", + ) + .unwrap(), + ], + [ + Fp::from_str( + "13001484695584753475562184349533365512515447041450030471627087395341039487710", + ) + .unwrap(), + Fp::from_str( + "477322000667279478600757543806155989948171541982639893984064422067850617496", + ) + .unwrap(), + Fp::from_str( + "13913755821658634147813329813115566967428755223601185963529801459396673113438", + ) + .unwrap(), + ], + [ + Fp::from_str( + "16621869429023470107454028095846067937827722393398508604914831452950874033411", + ) + .unwrap(), + Fp::from_str( + "21755744236927410239079501831014076529931327263341620300431356747367343619046", + ) + .unwrap(), + Fp::from_str( + "26538666591151124505694487799121414506088199961481579132019627484065014831180", + ) + .unwrap(), + ], + [ + Fp::from_str( + "3066480818457008068617042549071052338581291837882909165666223566402713429090", + ) + .unwrap(), + Fp::from_str( + "16182268213934119294035309949459684472027705439038023775276926916166831108357", + ) + .unwrap(), + Fp::from_str( + "28907604876608422892474268478706783033050951245339691569015166507728369585190", + ) + .unwrap(), + ], + [ + Fp::from_str( + "27973960109508292680965426133498827831691369851701664449575719912259359998113", + ) + .unwrap(), + Fp::from_str( + "1456924360278399121996742356757866616312146358469991014696110099534285524446", + ) + .unwrap(), + Fp::from_str( + "8234248752911525485438611255163504976087091103090603316695312869292347668495", + ) + .unwrap(), + ], + [ + Fp::from_str( + "8716078950082339630026654067608811496722305720644485560320987802533380421009", + ) + .unwrap(), + Fp::from_str( + "19016744645809919602099479306503354923553336014593353020688463619133130053825", + ) + .unwrap(), + Fp::from_str( + "24379650661051444982012238084495990858827340608012118841005379796362233056432", + ) + .unwrap(), + ], + [ + Fp::from_str( + "2245379544097631382062919677963998259142792890502492881341386639439507471783", + ) + .unwrap(), + Fp::from_str( + "28788137434161061988371619554419440748189388934884757179010092973102292086583", + ) + .unwrap(), + Fp::from_str( + "7187000185648741287953633167647835668543536354944774631102766873251849991238", + ) + .unwrap(), + ], + [ + Fp::from_str( + "18319349500538500800225762827448369057030532278398270164660609327776487168142", + ) + .unwrap(), + Fp::from_str( + "2622932985948021877314529887962683530522545893985767148345336304947201715671", + ) + .unwrap(), + Fp::from_str( + "13805188629797792210337544360632964855143280581052079479249966961215582531026", + ) + .unwrap(), + ], + [ + Fp::from_str( + "27457600993464082637917106210690168172469473943609357897393615707457194410878", + ) + .unwrap(), + Fp::from_str( + "15448646156961779103834447043970817898237835202826003934642165760908058355399", + ) + .unwrap(), + Fp::from_str( + "9396792545729486882231669677795667529746274932273033601723318032992363022062", + ) + .unwrap(), + ], + [ + Fp::from_str( + "9927877141952679457141759789181418464292082444806533413864151258248124544859", + ) + .unwrap(), + Fp::from_str( + "23827901395971835838179844085051957393677906360196119690926757794561937573142", + ) + .unwrap(), + Fp::from_str( + "3273544693673216914876067527455588276979859627093391584406340272737391174619", + ) + .unwrap(), + ], + [ + Fp::from_str( + "19571510438350300564152393820251652609646082150148656806391655428002614034315", + ) + .unwrap(), + Fp::from_str( + "4458840243585913642400750597703353770666314833058197517675446022682775625834", + ) + .unwrap(), + Fp::from_str( + "6452218213610300363069953741424106105609715382419342511693148495219793324457", + ) + .unwrap(), + ], + [ + Fp::from_str( + "14558167930891460678441266912176752652821641543245953113671886345167213541771", + ) + .unwrap(), + Fp::from_str( + "10650967986920075561478528461783351160938460620955779955379459848889204404950", + ) + .unwrap(), + Fp::from_str( + "19990009778942542934049216419052172134625404062770188357110708518621145688588", + ) + .unwrap(), + ], + [ + Fp::from_str( + "26855242974447190235826233682457047761532515293146087151296725996543442567035", + ) + .unwrap(), + Fp::from_str( + "22785340043356532865086769889360674409753343398766563441587096485751538658065", + ) + .unwrap(), + Fp::from_str( + "28603049427449348335651629195385434188071937908693764500052489540779792538285", + ) + .unwrap(), + ], + [ + Fp::from_str( + "20545812864989828913452616721240947168977365844984763819184465128164378967167", + ) + .unwrap(), + Fp::from_str( + "23234068381345797209897730226956922073109641728569353961504167817770340037954", + ) + .unwrap(), + Fp::from_str( + "26031714567641615877877111172701145299483019910006153132858512509897185854695", + ) + .unwrap(), + ], + [ + Fp::from_str( + "9512221744061419790435674197238913998387834650389922233458121639503195504983", + ) + .unwrap(), + Fp::from_str( + "12587458000103271975978240683793268604398305885278203470492658961734100340536", + ) + .unwrap(), + Fp::from_str( + "9670291694005369437277651504604785512303147991710650505302465204429311229197", + ) + .unwrap(), + ], + [ + Fp::from_str( + "26995526763045548800439747262386290359229145489609341602564040676717570935439", + ) + .unwrap(), + Fp::from_str( + "23742712112104280264401317024221734961713400615669958343926511931219510484675", + ) + .unwrap(), + Fp::from_str( + "27931469778579449247589315744656633392873808631802461175539563849884447358271", + ) + .unwrap(), + ], + [ + Fp::from_str( + "20669006894143187877081688942720159738269397552445286314270368345994751825389", + ) + .unwrap(), + Fp::from_str( + "26891772301075275370472640177651637211280740381619976926886106618375467277414", + ) + .unwrap(), + Fp::from_str( + "28387986011980449959047232529988203397251084614417760995257355718700961696092", + ) + .unwrap(), + ], + [ + Fp::from_str( + "6579105010484741592730389416372694666279917604793318157514380025250233913402", + ) + .unwrap(), + Fp::from_str( + "11007035767869292700964744408562802781669930023548892567535397874932420229930", + ) + .unwrap(), + Fp::from_str( + "981148366863906885900456473323410468923514528856216824044152942069412627408", + ) + .unwrap(), + ], + [ + Fp::from_str( + "22213671088722307302576907504985884923571642958053627659840326928319445671280", + ) + .unwrap(), + Fp::from_str( + "1318836216310789598614608105109389429335273432455224127576823891011367206122", + ) + .unwrap(), + Fp::from_str( + "25586582796990779718352441955439394949194222626688223867952982491529809559257", + ) + .unwrap(), + ], + [ + Fp::from_str( + "4923739488579452777913681531125585976446366144127161879759262506690369040090", + ) + .unwrap(), + Fp::from_str( + "23505612338866210737103599484620591026802005128655081877133994175016351514827", + ) + .unwrap(), + Fp::from_str( + "323887003859465324514901860965142186539600668250760639664361851354147799637", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10198923064967306784017949469108033682156920551672348936591491217255268794658", + ) + .unwrap(), + Fp::from_str( + "9593680688139131432883442351722730169325112619984238956948153423155998917175", + ) + .unwrap(), + Fp::from_str( + "27027988263960602112273050725720071355535922812577299127302015348825197871870", + ) + .unwrap(), + ], + [ + Fp::from_str( + "14419883951157390867695097127684346981136020111885301573583640959136319507752", + ) + .unwrap(), + Fp::from_str( + "5104414988075833278683649298543440897371415916271358703850262680431809374355", + ) + .unwrap(), + Fp::from_str( + "24739655595299332818980677669648719986462429574612913501586844601377825836782", + ) + .unwrap(), + ], + [ + Fp::from_str( + "28522818684103966731129743408029731246564480741348128436668680764518115102581", + ) + .unwrap(), + Fp::from_str( + "21520350704208288978690888796633940487888044365108767319141211249242880355961", + ) + .unwrap(), + Fp::from_str( + "17391005598311948834360476853940353239444383292422171321575043660157438608537", + ) + .unwrap(), + ], + [ + Fp::from_str( + "15367833944125677011173327826570204350687925236257190051755087781855930646142", + ) + .unwrap(), + Fp::from_str( + "21715073802090413714601069529558707101797361591183718695054701329871284436172", + ) + .unwrap(), + Fp::from_str( + "8994093285353831008525761670339342200997965950202092028313103110478252647618", + ) + .unwrap(), + ], + [ + Fp::from_str( + "8370824693889782161629525898408725452177580012023459750897244954935682978671", + ) + .unwrap(), + Fp::from_str( + "16123253540853556024347150096993154278773652905830608614979368087152152043083", + ) + .unwrap(), + Fp::from_str( + "3535380953353495025888433493640531836449699255364366295870140701379497967423", + ) + .unwrap(), + ], + [ + Fp::from_str( + "6954518484798178646508803478426114267143074508396663899281411171704702743829", + ) + .unwrap(), + Fp::from_str( + "28903134801897070276701950388422104654018369750191967384271618837091859516942", + ) + .unwrap(), + Fp::from_str( + "20872505363530172448468374920196608937030884647150175861507911076568784054834", + ) + .unwrap(), + ], + [ + Fp::from_str( + "6902861581703501105786795670676641959401710346423594578401934671029571262513", + ) + .unwrap(), + Fp::from_str( + "10124161387604183369443890585742198433184078889862870469507328332805848271064", + ) + .unwrap(), + Fp::from_str( + "10488004060799269337071647841224034919633445750252076195310163972966405029030", + ) + .unwrap(), + ], + [ + Fp::from_str( + "507704911991278613147490289466075160618843900088471236546244459176211783848", + ) + .unwrap(), + Fp::from_str( + "7252739745607302667257774481690407709040936359589867974787811552896597703097", + ) + .unwrap(), + Fp::from_str( + "23278073497974004442836030100920157527910770509761505828038443336325476654930", + ) + .unwrap(), + ], + [ + Fp::from_str( + "22766285055433137793164317120096790621982728188995759745859222009100808389090", + ) + .unwrap(), + Fp::from_str( + "23129058299483468195787339200845749049960038336751758017949899311636830205152", + ) + .unwrap(), + Fp::from_str( + "16665333681978951552434356320651834889869437822496200946959897681307959400425", + ) + .unwrap(), + ], + [ + Fp::from_str( + "12145699202182574939376505075528461451757079041659894988784442097333218352048", + ) + .unwrap(), + Fp::from_str( + "26340666275844437932755852805027863696219004039301187587209926587657008948704", + ) + .unwrap(), + Fp::from_str( + "19208771804191839410002226941825269105677187954811130189835856228258013753206", + ) + .unwrap(), + ], + [ + Fp::from_str( + "21957102494792377508237608216278079874536155315851198461024084071231867104453", + ) + .unwrap(), + Fp::from_str( + "6933367436450995525851693784691226222726503560893470094614235356287049091852", + ) + .unwrap(), + Fp::from_str( + "15707767379191450768747057313641112321773921923533732633534831270357733757271", + ) + .unwrap(), + ], + [ + Fp::from_str( + "27661963645951389261638591385668507557739541354225916772550248746235106571003", + ) + .unwrap(), + Fp::from_str( + "19699458096897937575096494582288688995241392471402204995195057374756282223421", + ) + .unwrap(), + Fp::from_str( + "902873385171181344315871113842580653512118892800584003934454469411716098791", + ) + .unwrap(), + ], + [ + Fp::from_str( + "17184835876565576154014372215369798779520343573944211203710896053325717110660", + ) + .unwrap(), + Fp::from_str( + "664657295519303589036289440053175741110032988007278988577620229144220576240", + ) + .unwrap(), + Fp::from_str( + "10803972669668998371638869508774217165881281885838503958226056357738500321396", + ) + .unwrap(), + ], + [ + Fp::from_str( + "2329846733754251453632375727999372856194157027336139087170310553870624325301", + ) + .unwrap(), + Fp::from_str( + "14139944357035048486675740400655356660678187875721949218090128899571575479791", + ) + .unwrap(), + Fp::from_str( + "18368148273419807418427674359327442879484531833435081951870369910704734685351", + ) + .unwrap(), + ], + [ + Fp::from_str( + "10480273665080572189328459165704340191901489646067580012574464138528963201459", + ) + .unwrap(), + Fp::from_str( + "21773636700078124500346009061678153597323236568110076029811348966753228682835", + ) + .unwrap(), + Fp::from_str( + "18184268307211429260956076021417309535471438696101133218049142374847151474905", + ) + .unwrap(), + ], + [ + Fp::from_str( + "25957533025669311312382992376854735734491934602484112256289764602447226406852", + ) + .unwrap(), + Fp::from_str( + "22223261506176684934865714490719116745135417403915426392159449667435294570739", + ) + .unwrap(), + Fp::from_str( + "22937309162832499167063076416585504361695925730111272512450449042837586253575", + ) + .unwrap(), + ], + [ + Fp::from_str( + "16956181785481598286719868503945127919581091625126206673934113115358441284347", + ) + .unwrap(), + Fp::from_str( + "8497782777197814773596870810881707148695901557289856910220737358078100998191", + ) + .unwrap(), + Fp::from_str( + "21135503731586600979470064722475007625236017670426339278983640892218291297054", + ) + .unwrap(), + ], + [ + Fp::from_str( + "17809297343844488723046665739910571149089769215421130894378638450427880983923", + ) + .unwrap(), + Fp::from_str( + "72435395972188389387093550708873189001876361107443937983754878061522372356", + ) + .unwrap(), + Fp::from_str( + "7511239878692099209014947248389283109997289411550315391143819429585903287870", + ) + .unwrap(), + ], + ]), + } + } + + pub fn params() -> &'static ArithmeticSpongeParams { + static PARAMS: Lazy> = Lazy::new(make_params); + &PARAMS + } +} From 4eefafe6bb1376de23b96ca1bde72b19e22d2880 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Fri, 22 Nov 2024 13:26:07 +0100 Subject: [PATCH 098/175] Use workspace crate `poseidon` in `mina-p2p-messages` --- Cargo.lock | 2 +- mina-p2p-messages/Cargo.toml | 2 +- mina-p2p-messages/src/v2/hashing.rs | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c525bdbd9e..f81be3db8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3767,11 +3767,11 @@ dependencies = [ "lazy_static", "mina-curves", "mina-hasher", - "mina-poseidon", "mina-signer", "num-bigint", "o1-utils", "openmina-macros", + "poseidon", "rsexp", "rsexp-derive", "serde", diff --git a/mina-p2p-messages/Cargo.toml b/mina-p2p-messages/Cargo.toml index 760edce55e..d009efebbf 100644 --- a/mina-p2p-messages/Cargo.toml +++ b/mina-p2p-messages/Cargo.toml @@ -30,7 +30,7 @@ openmina-macros = { path = "../macros" } mina-hasher = { workspace = true } mina-curves = { workspace = true } mina-signer = { workspace = true } -mina-poseidon = { workspace = true } +poseidon = { workspace = true } o1-utils = { workspace = true } ark-ff = { version = "0.3.0", features = [ "parallel", "asm" ] } diff --git a/mina-p2p-messages/src/v2/hashing.rs b/mina-p2p-messages/src/v2/hashing.rs index 71137d49b4..0ca9ab3741 100644 --- a/mina-p2p-messages/src/v2/hashing.rs +++ b/mina-p2p-messages/src/v2/hashing.rs @@ -5,11 +5,7 @@ use binprot::BinProtWrite; use binprot_derive::{BinProtRead, BinProtWrite}; use generated::MinaStateBlockchainStateValueStableV2; use mina_hasher::Fp; -use mina_poseidon::{ - constants::PlonkSpongeConstantsKimchi, - pasta::fp_kimchi::static_params, - poseidon::{ArithmeticSponge, Sponge}, -}; +use poseidon::ArithmeticSponge; use serde::{Deserialize, Serialize}; use sha2::{ digest::{generic_array::GenericArray, typenum::U32}, @@ -473,14 +469,14 @@ fn param_to_field(param: &str, pad: &[u8; 32]) -> Fp { } pub fn hash_noinputs(param: &str) -> Fp { - let mut sponge = ArithmeticSponge::::new(static_params()); + let mut sponge = ArithmeticSponge::::new(); sponge.absorb(&[param_to_field(param, NO_INPUT_PARAMS)]); sponge.squeeze() } pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = ArithmeticSponge::::new(static_params()); + let mut sponge = ArithmeticSponge::::new(); sponge.absorb(&[param_to_field(param, INPUT_PARAMS)]); sponge.squeeze(); From d7ecfaef998ca1503591571ceadb14324bf791f9 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Fri, 22 Nov 2024 14:42:50 +0100 Subject: [PATCH 099/175] Fix clippy lints --- ledger/src/hash.rs | 6 ++--- ledger/src/proofs/step.rs | 4 +-- ledger/src/proofs/transaction.rs | 4 +-- mina-p2p-messages/src/v2/hashing.rs | 4 +-- poseidon/src/lib.rs | 41 ++++++++++++----------------- 5 files changed, 26 insertions(+), 33 deletions(-) diff --git a/ledger/src/hash.rs b/ledger/src/hash.rs index 575acf52fe..a8dcef5e48 100644 --- a/ledger/src/hash.rs +++ b/ledger/src/hash.rs @@ -212,7 +212,7 @@ fn param_to_field_noinputs(param: &str) -> Fp { } pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = ArithmeticSponge::::new(); + let mut sponge = ArithmeticSponge::::default(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); @@ -222,14 +222,14 @@ pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { } pub fn hash_fields>(fields: &[F]) -> F { - let mut sponge = ArithmeticSponge::::new(); + let mut sponge = ArithmeticSponge::::default(); sponge.absorb(fields); sponge.squeeze() } pub fn hash_noinputs(param: &str) -> Fp { - let mut sponge = ArithmeticSponge::::new(); + let mut sponge = ArithmeticSponge::::default(); // ArithmeticSponge::::new(pasta::fp_kimchi::static_params()); sponge.absorb(&[param_to_field_noinputs(param)]); diff --git a/ledger/src/proofs/step.rs b/ledger/src/proofs/step.rs index efb9637568..57769f67af 100644 --- a/ledger/src/proofs/step.rs +++ b/ledger/src/proofs/step.rs @@ -2010,14 +2010,14 @@ pub fn expand_deferred(params: ExpandDeferredParams) -> Result::new(); + let mut sponge = poseidon::ArithmeticSponge::::default(); for old_bulletproof_challenges in &old_bulletproof_challenges { sponge.absorb(old_bulletproof_challenges); } sponge.squeeze() }; - let mut sponge = poseidon::FqSponge::new(); + let mut sponge = poseidon::FqSponge::default(); sponge.absorb_fq(&[four_u64_to_field( &proof_state.sponge_digest_before_evaluations, )?]); diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index cc17eda786..1793555fbf 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -2594,7 +2594,7 @@ pub mod transaction_snark { use crate::param_to_field; use ::poseidon::ArithmeticSponge; - let mut sponge = ArithmeticSponge::::new(); + let mut sponge = ArithmeticSponge::::default(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); sponge.state @@ -2613,7 +2613,7 @@ pub mod transaction_snark { use crate::param_to_field; use ::poseidon::ArithmeticSponge; - let mut sponge = ArithmeticSponge::::new(); + let mut sponge = ArithmeticSponge::::default(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); sponge.state diff --git a/mina-p2p-messages/src/v2/hashing.rs b/mina-p2p-messages/src/v2/hashing.rs index 0ca9ab3741..b6e9196cc7 100644 --- a/mina-p2p-messages/src/v2/hashing.rs +++ b/mina-p2p-messages/src/v2/hashing.rs @@ -469,14 +469,14 @@ fn param_to_field(param: &str, pad: &[u8; 32]) -> Fp { } pub fn hash_noinputs(param: &str) -> Fp { - let mut sponge = ArithmeticSponge::::new(); + let mut sponge = ArithmeticSponge::::default(); sponge.absorb(&[param_to_field(param, NO_INPUT_PARAMS)]); sponge.squeeze() } pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = ArithmeticSponge::::new(); + let mut sponge = ArithmeticSponge::::default(); sponge.absorb(&[param_to_field(param, INPUT_PARAMS)]); sponge.squeeze(); diff --git a/poseidon/src/lib.rs b/poseidon/src/lib.rs index a736616b49..a1aa5ee850 100644 --- a/poseidon/src/lib.rs +++ b/poseidon/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(clippy::indexing_slicing, clippy::arithmetic_side_effects)] + use std::marker::PhantomData; use ark_ff::{BigInteger256, Field}; @@ -49,10 +51,7 @@ impl SpongeConstants for PlonkSpongeConstantsLegacy { const PERM_INITIAL_ARK: bool = true; } -fn apply_mds_matrix( - params: &ArithmeticSpongeParams, - state: &[F], -) -> [F; 3] { +fn apply_mds_matrix(params: &ArithmeticSpongeParams, state: &[F]) -> [F; 3] { let mut new_state = [F::zero(); 3]; for (i, sub_params) in params.mds.iter().enumerate() { @@ -72,7 +71,7 @@ pub fn full_round( for state_i in state.iter_mut() { *state_i = sbox::(*state_i); } - *state = apply_mds_matrix::(params, state); + *state = apply_mds_matrix::(params, state); for (i, x) in params.round_constants[r].iter().enumerate() { state[i].add_assign(x); } @@ -151,13 +150,9 @@ pub struct ArithmeticSponge, } -impl ArithmeticSponge { - pub fn full_round(&mut self, r: usize) { - full_round::(self.params, &mut self.state, r); - } - - fn poseidon_block_cipher(&mut self) { - poseidon_block_cipher::(self.params, &mut self.state); +impl, C: SpongeConstants> Default for ArithmeticSponge { + fn default() -> Self { + Self::new_with_params(F::get_params()) } } @@ -172,10 +167,6 @@ impl, C: SpongeConstants> ArithmeticSponge ArithmeticSponge { - Self::new_with_params(F::get_params()) - } - pub fn absorb(&mut self, x: &[F]) { if x.is_empty() { // Same as the loop below but doesn't add `x` @@ -215,8 +206,6 @@ impl, C: SpongeConstants> ArithmeticSponge F { - // assert_eq!(self.state.len(), 3); - // elog!("NSTATE={:?}", self.state.len()); match self.sponge_state { SpongeState::Squeezed(n) => { if n == self.rate { @@ -235,23 +224,28 @@ impl, C: SpongeConstants> ArithmeticSponge(self.params, &mut self.state); + } } #[derive(Clone)] pub struct FqSponge { sponge: ArithmeticSponge, - // sponge: ArithmeticSponge, last_squeezed: Vec, } -impl + Into> FqSponge { - pub fn new() -> Self { +impl + Into> Default for FqSponge { + fn default() -> Self { Self { - sponge: ArithmeticSponge::new(), + sponge: ArithmeticSponge::default(), last_squeezed: Vec::with_capacity(8), } } +} +impl + Into> FqSponge { pub fn absorb_fq(&mut self, x: &[F]) { self.last_squeezed.clear(); for fe in x { @@ -262,10 +256,9 @@ impl + Into> FqSponge { pub fn squeeze_limbs(&mut self) -> [u64; NUM_LIMBS] { const HIGH_ENTROPY_LIMBS: usize = 2; - if self.last_squeezed.len() >= NUM_LIMBS { + if let Some(nremains) = self.last_squeezed.len().checked_sub(NUM_LIMBS) { let limbs = std::array::from_fn(|i| self.last_squeezed[i]); - let nremains = self.last_squeezed.len() - NUM_LIMBS; self.last_squeezed.copy_within(NUM_LIMBS.., 0); self.last_squeezed.truncate(nremains); From 187a2f86af79c3462c355cba090bb9cf75beaf28 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Fri, 22 Nov 2024 16:07:23 +0100 Subject: [PATCH 100/175] Dedup poseidon::`{Inputs, hash_with_kimchi, hash..}` methods --- Cargo.lock | 2 + ledger/src/account/account.rs | 6 +- ledger/src/account/common.rs | 4 +- ledger/src/database/database_impl.rs | 4 +- ledger/src/hash.rs | 252 ++--------------- ledger/src/proofs/block.rs | 5 +- ledger/src/proofs/numbers/currency.rs | 2 +- ledger/src/proofs/numbers/nat.rs | 2 +- ledger/src/proofs/opt_sponge.rs | 12 +- ledger/src/proofs/public_input/messages.rs | 2 +- .../src/proofs/public_input/protocol_state.rs | 4 +- ledger/src/proofs/step.rs | 2 +- ledger/src/proofs/transaction.rs | 43 ++- ledger/src/proofs/zkapp.rs | 2 +- ledger/src/scan_state/currency.rs | 2 +- ledger/src/scan_state/fee_excess.rs | 5 +- ledger/src/scan_state/pending_coinbase.rs | 6 +- ledger/src/scan_state/protocol_state.rs | 7 +- ledger/src/scan_state/scan_state.rs | 5 +- ledger/src/scan_state/transaction_logic.rs | 10 +- .../src/sparse_ledger/sparse_ledger_impl.rs | 2 +- ledger/src/staged_ledger/hash.rs | 10 +- ledger/src/tree_version.rs | 2 +- ledger/src/verifier/mod.rs | 3 +- ledger/src/zkapps/snark.rs | 3 +- mina-p2p-messages/src/hash_input.rs | 253 ++---------------- mina-p2p-messages/src/v2/hashing.rs | 100 ++----- mina-p2p-messages/src/v2/manual.rs | 2 +- node/Cargo.toml | 1 + node/src/block_producer/mod.rs | 2 +- poseidon/src/hash.rs | 224 ++++++++++++++++ poseidon/src/lib.rs | 31 +-- poseidon/src/params.rs | 26 +- snark/Cargo.toml | 1 + snark/src/merkle_path/mod.rs | 2 +- 35 files changed, 395 insertions(+), 644 deletions(-) create mode 100644 poseidon/src/hash.rs diff --git a/Cargo.lock b/Cargo.lock index f81be3db8c..79762e910e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4193,6 +4193,7 @@ dependencies = [ "openmina-core", "openmina-node-account", "p2p", + "poseidon", "postcard", "rand", "redux", @@ -6641,6 +6642,7 @@ dependencies = [ "once_cell", "openmina-core", "poly-commitment", + "poseidon", "rand", "rayon", "redux", diff --git a/ledger/src/account/account.rs b/ledger/src/account/account.rs index b5dbe4e1c3..a95d905266 100644 --- a/ledger/src/account/account.rs +++ b/ledger/src/account/account.rs @@ -14,7 +14,6 @@ use serde::{Deserialize, Serialize}; use crate::{ gen_compressed, - hash::{hash_noinputs, hash_with_kimchi, Inputs}, proofs::{ field::{Boolean, FieldWitness, ToBoolean}, numbers::{ @@ -33,8 +32,9 @@ use crate::{ transaction_logic::account_min_balance_at_slot, }, zkapps::snark::FlaggedOption, - MerklePath, MyCow, ToInputs, + AppendToInputs as _, MerklePath, MyCow, ToInputs, }; +use poseidon::hash::{hash_noinputs, hash_with_kimchi, Inputs}; use super::common::*; @@ -1713,7 +1713,7 @@ fn verify_merkle_path(account: &Account, merkle_path: &[MerklePath]) -> Fp { param.clear(); write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); - crate::hash::hash_with_kimchi(param.as_str(), &hashes) + hash_with_kimchi(param.as_str(), &hashes) }) } diff --git a/ledger/src/account/common.rs b/ledger/src/account/common.rs index d7cd4fb913..a5d18590dc 100644 --- a/ledger/src/account/common.rs +++ b/ledger/src/account/common.rs @@ -65,7 +65,7 @@ impl ToFieldElements for VotingFor { } impl ToInputs for VotingFor { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut poseidon::hash::Inputs) { inputs.append_field(self.0); } } @@ -74,7 +74,7 @@ impl ToInputs for VotingFor { pub struct ReceiptChainHash(pub Fp); impl ToInputs for ReceiptChainHash { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut poseidon::hash::Inputs) { inputs.append_field(self.0); } } diff --git a/ledger/src/database/database_impl.rs b/ledger/src/database/database_impl.rs index 94bdce123e..177851dc23 100644 --- a/ledger/src/database/database_impl.rs +++ b/ledger/src/database/database_impl.rs @@ -312,7 +312,7 @@ impl DatabaseImpl { let path = match dir_name { Some(dir_name) => dir_name, None => { - let directory = "minadb-".to_owned() + &uuid; + let directory = format!("minadb-{}", &uuid); let mut path = PathBuf::from("/tmp"); path.push(&directory); @@ -328,7 +328,7 @@ impl DatabaseImpl { // path // ); - std::fs::create_dir_all(&path).ok(); + // std::fs::create_dir_all(&path).ok(); Self { depth, diff --git a/ledger/src/hash.rs b/ledger/src/hash.rs index a8dcef5e48..fe22e5cc91 100644 --- a/ledger/src/hash.rs +++ b/ledger/src/hash.rs @@ -1,240 +1,8 @@ -use ark_ff::{BigInteger, BigInteger256, Field, FromBytes}; use mina_hasher::Fp; use mina_signer::CompressedPubKey; -// use oracle::{poseidon::{ArithmeticSponge, Sponge}, constants::PlonkSpongeConstantsKimchi, pasta::fp_kimchi::static_params}; -use crate::{proofs::witness::Witness, scan_state::currency, FpExt}; -use poseidon::{ArithmeticSponge, SpongeParamsForField}; - -enum Item { - Bool(bool), - U2(u8), - U8(u8), - U32(u32), - U48([u8; 6]), - U64(u64), -} - -impl std::fmt::Debug for Item { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self { - Self::Bool(arg0) => f.write_fmt(format_args!("{}_bool", i32::from(*arg0))), - Self::U2(arg0) => f.write_fmt(format_args!("{}_u2", arg0)), - Self::U8(arg0) => f.write_fmt(format_args!("{}_u8", arg0)), - Self::U32(arg0) => f.write_fmt(format_args!("{}_u32", arg0)), - Self::U48(arg0) => f.write_fmt(format_args!("{:?}_u48", arg0)), - Self::U64(arg0) => f.write_fmt(format_args!("{}_u64", arg0)), - } - } -} - -impl Item { - fn nbits(&self) -> u32 { - match self { - Item::Bool(_) => 1, - Item::U2(_) => 2, - Item::U8(_) => 8, - Item::U32(_) => 32, - Item::U48(_) => 48, - Item::U64(_) => 64, - } - } - - fn as_bigint(&self) -> BigInteger256 { - match self { - Item::Bool(v) => { - if *v { - 1.into() - } else { - 0.into() - } - } - Item::U2(v) => (*v as u64).into(), - Item::U8(v) => (*v as u64).into(), - Item::U32(v) => (*v as u64).into(), - Item::U48(v) => { - let mut bytes = <[u8; 32]>::default(); - bytes[..6].copy_from_slice(&v[..]); - BigInteger256::read(&bytes[..]).unwrap() // Never fail with only 6 bytes - } - Item::U64(v) => (*v).into(), - } - } -} - -pub struct Inputs { - fields: Vec, - packeds: Vec, -} - -impl Default for Inputs { - fn default() -> Self { - Self::new() - } -} - -impl std::fmt::Debug for Inputs { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.debug_struct("Inputs") - .field( - &format!("fields[{:?}]", self.fields.len()), - &self - .fields - .iter() - .map(|f| f.to_decimal()) - .collect::>(), - ) - .field(&format!("packeds[{:?}]", self.packeds.len()), &self.packeds) - .finish() - } -} - -impl Inputs { - pub fn new() -> Self { - Self { - fields: Vec::with_capacity(256), - packeds: Vec::with_capacity(256), - } - } - - pub fn append_bool(&mut self, value: bool) { - self.packeds.push(Item::Bool(value)); - } - - pub fn append_u2(&mut self, value: u8) { - self.packeds.push(Item::U2(value)); - } - - pub fn append_u8(&mut self, value: u8) { - self.packeds.push(Item::U8(value)); - } - - pub fn append_u32(&mut self, value: u32) { - self.packeds.push(Item::U32(value)); - } - - pub fn append_u64(&mut self, value: u64) { - self.packeds.push(Item::U64(value)); - } - - pub fn append_u48(&mut self, value: [u8; 6]) { - self.packeds.push(Item::U48(value)); - } - - pub fn append_field(&mut self, value: Fp) { - self.fields.push(value); - } - - pub fn append_bytes(&mut self, value: &[u8]) { - const BITS: [u8; 8] = [1, 2, 4, 8, 16, 32, 64, 128]; - - self.packeds.reserve(value.len() * 8); - - for byte in value { - for bit in BITS { - self.append_bool(byte & bit != 0); - } - } - } - - pub fn append(&mut self, value: &T) - where - T: ToInputs, - { - value.to_inputs(self); - } - - #[allow(clippy::wrong_self_convention)] - pub fn to_fields(mut self) -> Vec { - let mut nbits = 0; - let mut current: BigInteger256 = 0.into(); - - for (item, item_nbits) in self.packeds.iter().map(|i| (i.as_bigint(), i.nbits())) { - nbits += item_nbits; - - if nbits < 255 { - current.muln(item_nbits); - - // Addition, but we use 'bitwise or' because we know bits of - // `current` are zero (we just shift-left them) - current = BigInteger256([ - current.0[0] | item.0[0], - current.0[1] | item.0[1], - current.0[2] | item.0[2], - current.0[3] | item.0[3], - ]); - } else { - self.fields.push(current.try_into().unwrap()); // Never fail - current = item; - nbits = item_nbits; - } - } - - if nbits > 0 { - self.fields.push(current.try_into().unwrap()); // Never fail - } - - self.fields - } -} - -fn param_to_field_impl(param: &str, default: [u8; 32]) -> Fp { - let param_bytes = param.as_bytes(); - let len = param_bytes.len(); - - let mut fp = default; - fp[..len].copy_from_slice(param_bytes); - - Fp::read(&fp[..]).expect("fp read failed") -} - -pub fn param_to_field(param: &str) -> Fp { - const DEFAULT: [u8; 32] = [ - b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', b'*', - b'*', b'*', b'*', b'*', b'*', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - ]; - - if param.len() > 20 { - panic!("must be 20 byte maximum"); - } - - param_to_field_impl(param, DEFAULT) -} - -fn param_to_field_noinputs(param: &str) -> Fp { - const DEFAULT: [u8; 32] = [0; 32]; - - if param.len() > 32 { - panic!("must be 32 byte maximum"); - } - - param_to_field_impl(param, DEFAULT) -} - -pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = ArithmeticSponge::::default(); - - sponge.absorb(&[param_to_field(param)]); - sponge.squeeze(); - - sponge.absorb(fields); - sponge.squeeze() -} - -pub fn hash_fields>(fields: &[F]) -> F { - let mut sponge = ArithmeticSponge::::default(); - - sponge.absorb(fields); - sponge.squeeze() -} - -pub fn hash_noinputs(param: &str) -> Fp { - let mut sponge = ArithmeticSponge::::default(); - // ArithmeticSponge::::new(pasta::fp_kimchi::static_params()); - - sponge.absorb(&[param_to_field_noinputs(param)]); - sponge.squeeze() -} +use crate::{proofs::witness::Witness, scan_state::currency}; +use poseidon::hash::{hash_with_kimchi, Inputs}; pub trait ToInputs { fn to_inputs(&self, inputs: &mut Inputs); @@ -305,10 +73,26 @@ where } } +pub trait AppendToInputs { + fn append(&mut self, value: &T) + where + T: ToInputs; +} + +impl AppendToInputs for Inputs { + fn append(&mut self, value: &T) + where + T: ToInputs, + { + value.to_inputs(self); + } +} + #[cfg(test)] mod tests { use o1_utils::FieldHelpers; + use poseidon::hash::param_to_field; #[cfg(target_family = "wasm")] use wasm_bindgen_test::wasm_bindgen_test as test; diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs index 4fe40a73ca..9a1673bce4 100644 --- a/ledger/src/proofs/block.rs +++ b/ledger/src/proofs/block.rs @@ -6,6 +6,7 @@ use mina_curves::pasta::Fq; use mina_hasher::Fp; use mina_p2p_messages::v2; use openmina_core::constants::{constraint_constants, ForkConstants}; +use poseidon::hash::Inputs; use crate::{ dummy, @@ -36,7 +37,7 @@ use crate::{ }, staged_ledger::hash::StagedLedgerHash, zkapps::intefaces::{SignedAmountBranchParam, SignedAmountInterface}, - Inputs, ToInputs, + ToInputs, }; use super::{ @@ -619,7 +620,7 @@ mod vrf { }, scan_state::currency::{Amount, Balance}, sparse_ledger::SparseLedger, - AccountIndex, Address, + AccountIndex, Address, AppendToInputs, }; use super::*; diff --git a/ledger/src/proofs/numbers/currency.rs b/ledger/src/proofs/numbers/currency.rs index 5d48df544a..9a18c16afc 100644 --- a/ledger/src/proofs/numbers/currency.rs +++ b/ledger/src/proofs/numbers/currency.rs @@ -502,7 +502,7 @@ macro_rules! impl_currency { } impl ToInputs for $name { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut poseidon::hash::Inputs) { self.to_inner().to_inputs(inputs) } } diff --git a/ledger/src/proofs/numbers/nat.rs b/ledger/src/proofs/numbers/nat.rs index 8fba155935..9965c43450 100644 --- a/ledger/src/proofs/numbers/nat.rs +++ b/ledger/src/proofs/numbers/nat.rs @@ -255,7 +255,7 @@ macro_rules! impl_nat { } impl ToInputs for $name { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut ::poseidon::hash::Inputs) { self.to_inner().to_inputs(inputs) } } diff --git a/ledger/src/proofs/opt_sponge.rs b/ledger/src/proofs/opt_sponge.rs index fea9f1692e..f9dd6044be 100644 --- a/ledger/src/proofs/opt_sponge.rs +++ b/ledger/src/proofs/opt_sponge.rs @@ -1,4 +1,4 @@ -use poseidon::ArithmeticSpongeParams; +use poseidon::SpongeParams; use super::{ field::{field, Boolean, CircuitVar, FieldWitness}, @@ -20,7 +20,7 @@ pub enum SpongeState { pub struct OptSponge { pub state: [F; M], - params: &'static ArithmeticSpongeParams, + params: &'static SpongeParams, needs_final_permute_if_empty: bool, pub sponge_state: SpongeState, } @@ -162,7 +162,7 @@ where struct ConsumeParams<'a, F: FieldWitness> { needs_final_permute_if_empty: bool, start_pos: CircuitVar, - params: &'static ArithmeticSpongeParams, + params: &'static SpongeParams, input: &'a [(CircuitVar, F)], state: [F; 3], } @@ -268,7 +268,7 @@ fn consume(params: ConsumeParams, w: &mut Witness) -> [F; fn block_cipher( mut state: [F; M], - params: &ArithmeticSpongeParams, + params: &SpongeParams, w: &mut Witness, ) -> [F; M] { w.exists(state); @@ -281,7 +281,7 @@ fn block_cipher( fn full_round( state: &mut [F; M], r: usize, - params: &ArithmeticSpongeParams, + params: &SpongeParams, w: &mut Witness, ) { for state_i in state.iter_mut() { @@ -301,7 +301,7 @@ fn sbox(x: F) -> F { res * x } -fn apply_mds_matrix(params: &ArithmeticSpongeParams, state: &[F; 3]) -> [F; 3] { +fn apply_mds_matrix(params: &SpongeParams, state: &[F; 3]) -> [F; 3] { std::array::from_fn(|i| { state .iter() diff --git a/ledger/src/proofs/public_input/messages.rs b/ledger/src/proofs/public_input/messages.rs index 378e3994b8..522e88b18f 100644 --- a/ledger/src/proofs/public_input/messages.rs +++ b/ledger/src/proofs/public_input/messages.rs @@ -10,7 +10,7 @@ use mina_curves::{pasta::Fq, pasta::Pallas}; use mina_hasher::Fp; use poly_commitment::PolyComm; -use crate::hash::hash_fields; +use poseidon::hash::hash_fields; impl<'a> From<&'a VerifierIndex> for PlonkVerificationKeyEvals { fn from(verifier_index: &'a VerifierIndex) -> Self { diff --git a/ledger/src/proofs/public_input/protocol_state.rs b/ledger/src/proofs/public_input/protocol_state.rs index b413dedbfe..c414f1ae14 100644 --- a/ledger/src/proofs/public_input/protocol_state.rs +++ b/ledger/src/proofs/public_input/protocol_state.rs @@ -2,14 +2,14 @@ use mina_hasher::Fp; use mina_p2p_messages::v2::MinaBaseProtocolConstantsCheckedValueStableV1; use crate::{ - hash::Inputs, proofs::block::{ consensus::{CheckedConsensusState, ConsensusState}, ProtocolStateBody, }, scan_state::transaction_logic::protocol_state::{EpochData, EpochLedger}, - ToInputs, + AppendToInputs as _, ToInputs, }; +use poseidon::hash::Inputs; impl ToInputs for crate::proofs::block::BlockchainState { fn to_inputs(&self, inputs: &mut Inputs) { diff --git a/ledger/src/proofs/step.rs b/ledger/src/proofs/step.rs index 57769f67af..61f5984f37 100644 --- a/ledger/src/proofs/step.rs +++ b/ledger/src/proofs/step.rs @@ -2010,7 +2010,7 @@ pub fn expand_deferred(params: ExpandDeferredParams) -> Result::default(); + let mut sponge = poseidon::Sponge::::default(); for old_bulletproof_challenges in &old_bulletproof_challenges { sponge.absorb(old_bulletproof_challenges); } diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index 1793555fbf..91d28c6254 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -40,7 +40,7 @@ use crate::{ transaction_logic::{local_state::LocalState, transaction_union_payload}, }, verifier::get_srs_mut, - Account, MyCow, ReceiptChainHash, TimingAsRecord, TokenId, TokenSymbol, + Account, AppendToInputs, MyCow, ReceiptChainHash, TimingAsRecord, TokenId, TokenSymbol, }; use super::{ @@ -692,7 +692,7 @@ impl PlonkVerificationKeyEvals { } impl crate::ToInputs for PlonkVerificationKeyEvals { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut ::poseidon::hash::Inputs) { let Self { sigma, coefficients, @@ -1220,7 +1220,7 @@ impl std::fmt::Debug for InnerCurve { } impl crate::ToInputs for InnerCurve { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut ::poseidon::hash::Inputs) { let GroupAffine:: { x, y, .. } = self.to_affine(); inputs.append_field(x); inputs.append_field(y); @@ -1673,9 +1673,7 @@ pub mod legacy_input { pub mod poseidon { use std::marker::PhantomData; - use ::poseidon::{ - ArithmeticSpongeParams, PlonkSpongeConstantsKimchi, SpongeConstants, SpongeState, - }; + use ::poseidon::{PlonkSpongeConstantsKimchi, SpongeConstants, SpongeParams, SpongeState}; use super::*; @@ -1683,7 +1681,7 @@ pub mod poseidon { pub struct Sponge { pub state: [F; 3], pub sponge_state: SpongeState, - params: &'static ArithmeticSpongeParams, + params: &'static SpongeParams, nabsorb: usize, _constants: PhantomData, } @@ -1703,10 +1701,7 @@ pub mod poseidon { F: FieldWitness, C: SpongeConstants, { - pub fn new_with_state_params( - state: [F; 3], - params: &'static ArithmeticSpongeParams, - ) -> Self { + pub fn new_with_state_params(state: [F; 3], params: &'static SpongeParams) -> Self { Self { state, sponge_state: SpongeState::Absorbed(0), @@ -1963,7 +1958,7 @@ pub mod poseidon { } fn apply_mds_matrix( - params: &ArithmeticSpongeParams, + params: &SpongeParams, state: &[F; 3], ) -> [F; 3] { if C::PERM_FULL_MDS { @@ -2294,8 +2289,9 @@ pub mod transaction_snark { }, sparse_ledger::SparseLedger, zkapps::intefaces::{SignedAmountBranchParam, SignedAmountInterface}, - AccountId, Inputs, PermissionTo, PermsConst, Timing, TimingAsRecordChecked, ToInputs, + AccountId, PermissionTo, PermsConst, Timing, TimingAsRecordChecked, ToInputs, }; + use ::poseidon::hash::Inputs; use ark_ff::Zero; use crate::scan_state::{ @@ -2570,14 +2566,15 @@ pub mod transaction_snark { pub fn checked_legacy_hash(param: &str, inputs: LegacyInput, w: &mut Witness) -> Fp { use ::poseidon::fp_legacy::params; + use ::poseidon::hash::param_to_field; use ::poseidon::PlonkSpongeConstantsLegacy as Constants; // We hash the parameter first, without introducing values to the witness let initial_state: [Fp; 3] = { - use ::poseidon::ArithmeticSponge; + use ::poseidon::Sponge; - let mut sponge = ArithmeticSponge::::new_with_params(params()); - sponge.absorb(&[crate::param_to_field(param)]); + let mut sponge = Sponge::::new_with_params(params()); + sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); sponge.state }; @@ -2591,10 +2588,10 @@ pub mod transaction_snark { pub fn checked_hash(param: &str, inputs: &[Fp], w: &mut Witness) -> Fp { // We hash the parameter first, without introducing values to the witness let initial_state: [Fp; 3] = { - use crate::param_to_field; - use ::poseidon::ArithmeticSponge; + use ::poseidon::hash::param_to_field; + use ::poseidon::Sponge; - let mut sponge = ArithmeticSponge::::default(); + let mut sponge = Sponge::::default(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); sponge.state @@ -2610,10 +2607,10 @@ pub mod transaction_snark { pub fn checked_hash3(param: &str, inputs: &[Fp], w: &mut Witness) -> Fp { // We hash the parameter first, without introducing values to the witness let initial_state: [Fp; 3] = { - use crate::param_to_field; - use ::poseidon::ArithmeticSponge; + use ::poseidon::hash::param_to_field; + use ::poseidon::Sponge; - let mut sponge = ArithmeticSponge::::default(); + let mut sponge = Sponge::::default(); sponge.absorb(&[param_to_field(param)]); sponge.squeeze(); sponge.state @@ -3813,7 +3810,7 @@ impl MessagesForNextStepProof<'_> { /// https://github.com/MinaProtocol/mina/blob/32a91613c388a71f875581ad72276e762242f802/src/lib/pickles/common.ml#L33 pub fn hash(&self) -> [u64; 4] { let fields: Vec = self.to_fields(); - let field: Fp = crate::hash_fields(&fields); + let field: Fp = ::poseidon::hash::hash_fields(&fields); let bigint: BigInteger256 = field.into_repr(); bigint.0 diff --git a/ledger/src/proofs/zkapp.rs b/ledger/src/proofs/zkapp.rs index 797d71b2cd..c0ad492bfd 100644 --- a/ledger/src/proofs/zkapp.rs +++ b/ledger/src/proofs/zkapp.rs @@ -5,9 +5,9 @@ use kimchi::proof::PointEvaluations; use mina_curves::pasta::Fq; use mina_hasher::Fp; use mina_p2p_messages::v2; +use poseidon::hash::hash_with_kimchi; use crate::{ - hash_with_kimchi, proofs::{ constants::{ make_step_zkapp_data, StepMergeProof, StepZkappOptSignedOptSignedProof, diff --git a/ledger/src/scan_state/currency.rs b/ledger/src/scan_state/currency.rs index 282ad479bc..b44006bb4f 100644 --- a/ledger/src/scan_state/currency.rs +++ b/ledger/src/scan_state/currency.rs @@ -545,7 +545,7 @@ macro_rules! impl_number { } impl crate::ToInputs for $name { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut poseidon::hash::Inputs) { inputs.$append_name(self.0); } } diff --git a/ledger/src/scan_state/fee_excess.rs b/ledger/src/scan_state/fee_excess.rs index c82bce9e7f..16b80c1240 100644 --- a/ledger/src/scan_state/fee_excess.rs +++ b/ledger/src/scan_state/fee_excess.rs @@ -33,6 +33,7 @@ use ark_ff::{BigInteger, BigInteger256, Zero}; use mina_hasher::Fp; +use poseidon::hash::Inputs; use crate::{ proofs::{ @@ -40,7 +41,7 @@ use crate::{ numbers::currency::{CheckedFee, CheckedSigned}, witness::Witness, }, - ToInputs, TokenId, + AppendToInputs, ToInputs, TokenId, }; use super::{ @@ -66,7 +67,7 @@ pub struct CheckedFeeExcess { impl ToInputs for FeeExcess { /// https://github.com/MinaProtocol/mina/blob/4e0b324912017c3ff576704ee397ade3d9bda412/src/lib/mina_base/fee_excess.ml#L162 - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut Inputs) { let Self { fee_token_l, fee_excess_l, diff --git a/ledger/src/scan_state/pending_coinbase.rs b/ledger/src/scan_state/pending_coinbase.rs index de8aeb6cdd..3c2e516817 100644 --- a/ledger/src/scan_state/pending_coinbase.rs +++ b/ledger/src/scan_state/pending_coinbase.rs @@ -24,10 +24,10 @@ use ark_ff::{fields::arithmetic::InvalidBigInt, Zero}; use mina_hasher::Fp; use mina_signer::CompressedPubKey; use openmina_core::constants::constraint_constants; +use poseidon::hash::{hash_noinputs, hash_with_kimchi, Inputs}; use sha2::{Digest, Sha256}; use crate::{ - hash_noinputs, hash_with_kimchi, proofs::{ field::{field, Boolean}, numbers::{ @@ -38,7 +38,7 @@ use crate::{ witness::Witness, }, staged_ledger::hash::PendingCoinbaseAux, - Address, Inputs, MerklePath, ToInputs, + Address, AppendToInputs as _, MerklePath, ToInputs, }; use self::merkle_tree::MiniMerkleTree; @@ -480,7 +480,7 @@ impl merkle_tree::TreeHasher for StackHasher { fn merge_hash(depth: usize, left: Fp, right: Fp) -> Fp { let param = format!("MinaCbMklTree{:03}", depth); - crate::hash::hash_with_kimchi(param.as_str(), &[left, right]) + poseidon::hash::hash_with_kimchi(param.as_str(), &[left, right]) } fn empty_value() -> Stack { diff --git a/ledger/src/scan_state/protocol_state.rs b/ledger/src/scan_state/protocol_state.rs index dba137bb6d..e3e1232a58 100644 --- a/ledger/src/scan_state/protocol_state.rs +++ b/ledger/src/scan_state/protocol_state.rs @@ -1,10 +1,7 @@ use mina_hasher::Fp; -use crate::{ - hash::{hash_with_kimchi, Inputs}, - proofs::block::ProtocolState, - ToInputs, -}; +use crate::{proofs::block::ProtocolState, ToInputs}; +use poseidon::hash::{hash_with_kimchi, Inputs}; pub trait MinaHash { fn hash(&self) -> Fp; diff --git a/ledger/src/scan_state/scan_state.rs b/ledger/src/scan_state/scan_state.rs index e41c041749..cabb76037a 100644 --- a/ledger/src/scan_state/scan_state.rs +++ b/ledger/src/scan_state/scan_state.rs @@ -112,10 +112,11 @@ pub mod transaction_snark { }, sparse_ledger::SparseLedger, staged_ledger::hash::OCamlString, - Inputs, ToInputs, + AppendToInputs as _, ToInputs, }; use super::Fee; + use poseidon::hash::Inputs; pub type LedgerHash = Fp; @@ -393,7 +394,7 @@ pub mod transaction_snark { impl ToInputs for Statement { /// https://github.com/MinaProtocol/mina/blob/4e0b324912017c3ff576704ee397ade3d9bda412/src/lib/mina_state/snarked_ledger_state.ml#L263 - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut Inputs) { let Self { source, target, diff --git a/ledger/src/scan_state/transaction_logic.rs b/ledger/src/scan_state/transaction_logic.rs index 0369c2ada2..e7b3155b6f 100644 --- a/ledger/src/scan_state/transaction_logic.rs +++ b/ledger/src/scan_state/transaction_logic.rs @@ -10,20 +10,20 @@ use mina_p2p_messages::v2::{MinaBaseUserCommandStableV2, MinaTransactionTransact use mina_signer::CompressedPubKey; use openmina_core::constants::ConstraintConstants; use openmina_macros::SerdeYojsonEnum; +use poseidon::hash::{hash_noinputs, hash_with_kimchi, Inputs}; use crate::proofs::witness::Witness; use crate::scan_state::transaction_logic::transaction_partially_applied::FullyApplied; use crate::scan_state::transaction_logic::zkapp_command::MaybeWithStatus; use crate::zkapps::non_snark::{LedgerNonSnark, ZkappNonSnark}; -use crate::{ - hash_with_kimchi, zkapps, AccountIdOrderable, BaseLedger, ControlTag, Inputs, - VerificationKeyWire, -}; use crate::{ scan_state::transaction_logic::transaction_applied::{CommandApplied, Varying}, sparse_ledger::{LedgerIntf, SparseLedger}, Account, AccountId, ReceiptChainHash, Timing, TokenId, }; +use crate::{ + zkapps, AccountIdOrderable, AppendToInputs, BaseLedger, ControlTag, VerificationKeyWire, +}; use self::zkapp_command::AccessedOrNot; use self::{ @@ -926,7 +926,7 @@ pub mod zkapp_command { use rand::{seq::SliceRandom, Rng}; use crate::{ - dummy, gen_compressed, gen_keypair, hash_noinputs, + dummy, gen_compressed, gen_keypair, proofs::{ field::{Boolean, ToBoolean}, to_field_elements::ToFieldElements, diff --git a/ledger/src/sparse_ledger/sparse_ledger_impl.rs b/ledger/src/sparse_ledger/sparse_ledger_impl.rs index 3667005bdc..ede79c47f0 100644 --- a/ledger/src/sparse_ledger/sparse_ledger_impl.rs +++ b/ledger/src/sparse_ledger/sparse_ledger_impl.rs @@ -170,7 +170,7 @@ impl SparseLedgerImpl { param.clear(); write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); - current = crate::hash::hash_with_kimchi(param.as_str(), &hashes); + current = poseidon::hash::hash_with_kimchi(param.as_str(), &hashes); addr = addr.parent().unwrap(); } diff --git a/ledger/src/staged_ledger/hash.rs b/ledger/src/staged_ledger/hash.rs index 70d0cd3092..f649070908 100644 --- a/ledger/src/staged_ledger/hash.rs +++ b/ledger/src/staged_ledger/hash.rs @@ -1,8 +1,12 @@ use ark_ff::{PrimeField, ToBytes}; use mina_hasher::Fp; +use poseidon::hash::Inputs; use sha2::{Digest, Sha256}; -use crate::{proofs::field::FieldWitness, scan_state::pending_coinbase::PendingCoinbase, ToInputs}; +use crate::{ + proofs::field::FieldWitness, scan_state::pending_coinbase::PendingCoinbase, + AppendToInputs as _, ToInputs, +}; /// Convert to/from OCaml strings, such as /// "u~\218kzX\228$\027qG\239\135\255:\143\171\186\011\200P\243\163\135\223T>\017\172\254\1906" @@ -168,7 +172,7 @@ impl NonStark { impl ToInputs for NonStark { /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/staged_ledger_hash.ml#L193 - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut Inputs) { let digest = self.digest(); inputs.append_bytes(digest.as_slice()); } @@ -228,7 +232,7 @@ impl StagedLedgerHash { } impl ToInputs for StagedLedgerHash { - fn to_inputs(&self, inputs: &mut crate::Inputs) { + fn to_inputs(&self, inputs: &mut Inputs) { let Self { non_snark, pending_coinbase_hash, diff --git a/ledger/src/tree_version.rs b/ledger/src/tree_version.rs index 192cc24dd4..2685cd1b2f 100644 --- a/ledger/src/tree_version.rs +++ b/ledger/src/tree_version.rs @@ -26,7 +26,7 @@ impl TreeVersion for V2 { fn hash_node(height: usize, left: Fp, right: Fp) -> Fp { let param = format!("MinaMklTree{height:03}"); - crate::hash::hash_with_kimchi(param.as_str(), &[left, right]) + poseidon::hash::hash_with_kimchi(param.as_str(), &[left, right]) } fn hash_leaf(leaf: &Self::Account) -> Fp { diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs index e551bfe565..fb057caab7 100644 --- a/ledger/src/verifier/mod.rs +++ b/ledger/src/verifier/mod.rs @@ -232,9 +232,10 @@ pub mod common { use mina_p2p_messages::v2::PicklesProofProofsVerifiedMaxStableV2; use mina_signer::{CompressedPubKey, PubKey, Signature}; + use poseidon::hash::hash_with_kimchi; use crate::{ - decompress_pk, hash_with_kimchi, + decompress_pk, scan_state::transaction_logic::{ valid, verifiable, zkapp_command::{self, valid::of_verifiable, AccountUpdate}, diff --git a/ledger/src/zkapps/snark.rs b/ledger/src/zkapps/snark.rs index f7463779a1..2d54935f59 100644 --- a/ledger/src/zkapps/snark.rs +++ b/ledger/src/zkapps/snark.rs @@ -3,6 +3,7 @@ use std::{cell::Cell, fmt::Write, marker::PhantomData}; use ark_ff::Zero; use mina_hasher::Fp; use mina_signer::CompressedPubKey; +use poseidon::hash::Inputs; use crate::{ checked_equal_compressed_key, checked_equal_compressed_key_const_and, @@ -36,7 +37,7 @@ use crate::{ }, sparse_ledger::SparseLedger, zkapps::zkapp_logic, - Account, AccountId, AuthRequired, AuthRequiredEncoded, Inputs, MyCow, ReceiptChainHash, + Account, AccountId, AppendToInputs, AuthRequired, AuthRequiredEncoded, MyCow, ReceiptChainHash, ToInputs, TokenId, VerificationKey, VerificationKeyWire, ZkAppAccount, TXN_VERSION_CURRENT, }; diff --git a/mina-p2p-messages/src/hash_input.rs b/mina-p2p-messages/src/hash_input.rs index 550c56f020..8d323c05b0 100644 --- a/mina-p2p-messages/src/hash_input.rs +++ b/mina-p2p-messages/src/hash_input.rs @@ -1,31 +1,30 @@ use std::ops::Deref; -use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger, BigInteger256, FromBytes}; -use mina_hasher::Fp; -use o1_utils::FieldHelpers; +use ark_ff::fields::arithmetic::InvalidBigInt; +use poseidon::hash::Inputs; use crate::{ - b58::Base58CheckOfBinProt, bigint::BigInt, list::List, number::{Int32, Int64, UInt32, UInt64}, - pseq::PaddedSeq, string::ByteString, string::ZkAppUri, }; -pub trait ToInput { +/// Difference with `ToInputs` in `ledger` is that it can fail here, due +/// to invalid bigints +pub trait FailableToInputs { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt>; } -impl ToInput for bool { +impl FailableToInputs for bool { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_bool(*self); Ok(()) } } -impl ToInput for BigInt { +impl FailableToInputs for BigInt { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let field = self.to_field()?; inputs.append_field(field); @@ -33,65 +32,52 @@ impl ToInput for BigInt { } } -impl ToInput for Int32 { +impl FailableToInputs for Int32 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_u32(self.as_u32()); Ok(()) } } -impl ToInput for Int64 { +impl FailableToInputs for Int64 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_u64(self.as_u64()); Ok(()) } } -impl ToInput for UInt32 { +impl FailableToInputs for UInt32 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_u32(self.as_u32()); Ok(()) } } -impl ToInput for UInt64 { +impl FailableToInputs for UInt64 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_u64(self.as_u64()); Ok(()) } } -impl ToInput for ByteString { +impl FailableToInputs for ByteString { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_bytes(self.as_ref()); Ok(()) } } -impl ToInput for ZkAppUri { +impl FailableToInputs for ZkAppUri { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_bytes(self.as_ref()); Ok(()) } } -impl ToInput for Vec +impl FailableToInputs for List where D: Deref, - T: ToInput, -{ - fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { - for v in self.iter() { - v.to_input(inputs)?; - } - Ok(()) - } -} - -impl ToInput for List -where - D: Deref, - T: ToInput, + T: FailableToInputs, { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { for v in self.deref().iter() { @@ -101,215 +87,6 @@ where } } -impl ToInput for (T, T) -where - T: ToInput, -{ - fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { - self.0.to_input(inputs)?; - self.1.to_input(inputs)?; - Ok(()) - } -} - -impl ToInput for Option -where - T: ToInput + Default, -{ - fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { - match self.as_ref() { - Some(v) => v.to_input(inputs), - None => T::default().to_input(inputs), - } - } -} - -impl ToInput for PaddedSeq -where - T: ToInput, -{ - fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { - for v in &self.0 { - v.to_input(inputs)?; - } - Ok(()) - } -} - -impl ToInput for Base58CheckOfBinProt -where - T: ToInput, -{ - fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { - self.inner().to_input(inputs) - } -} - -#[allow(unused)] -enum Packed { - Bool(bool), - U2(u8), - U8(u8), - U32(u32), - U48([u8; 6]), - U64(u64), -} - -impl std::fmt::Debug for Packed { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self { - Self::Bool(arg0) => f.write_fmt(format_args!("{}_bool", i32::from(*arg0))), - Self::U2(arg0) => f.write_fmt(format_args!("{}_u2", arg0)), - Self::U8(arg0) => f.write_fmt(format_args!("{}_u8", arg0)), - Self::U32(arg0) => f.write_fmt(format_args!("{}_u32", arg0)), - Self::U48(arg0) => f.write_fmt(format_args!("{:?}_u48", arg0)), - Self::U64(arg0) => f.write_fmt(format_args!("{}_u64", arg0)), - } - } -} - -impl Packed { - fn nbits(&self) -> u32 { - match self { - Packed::Bool(_) => 1, - Packed::U2(_) => 2, - Packed::U8(_) => 8, - Packed::U32(_) => 32, - Packed::U48(_) => 48, - Packed::U64(_) => 64, - } - } - - fn as_bigint(&self) -> BigInteger256 { - match self { - Packed::Bool(v) => { - if *v { - 1.into() - } else { - 0.into() - } - } - Packed::U2(v) => (*v as u64).into(), - Packed::U8(v) => (*v as u64).into(), - Packed::U32(v) => (*v as u64).into(), - Packed::U48(v) => { - let mut bytes = <[u8; 32]>::default(); - bytes[..6].copy_from_slice(&v[..]); - BigInteger256::read(&bytes[..]).unwrap() - } - Packed::U64(v) => (*v).into(), - } - } -} - -pub struct Inputs { - fields: Vec, - packeds: Vec, -} - -impl Default for Inputs { - fn default() -> Self { - Self::new() - } -} - -impl std::fmt::Debug for Inputs { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.debug_struct("Inputs") - .field( - &format!("fields[{:?}]", self.fields.len()), - &self.fields.iter().map(|f| f.to_hex()).collect::>(), - ) - .field(&format!("packeds[{:?}]", self.packeds.len()), &self.packeds) - .finish() - } -} - -impl Inputs { - pub fn new() -> Self { - Self { - fields: Vec::with_capacity(256), - packeds: Vec::with_capacity(256), - } - } - - pub fn append_bool(&mut self, value: bool) { - self.packeds.push(Packed::Bool(value)); - } - - #[allow(unused)] - pub fn append_u2(&mut self, value: u8) { - self.packeds.push(Packed::U2(value)); - } - - #[allow(unused)] - pub fn append_u8(&mut self, value: u8) { - self.packeds.push(Packed::U8(value)); - } - - pub fn append_u32(&mut self, value: u32) { - self.packeds.push(Packed::U32(value)); - } - - pub fn append_u64(&mut self, value: u64) { - self.packeds.push(Packed::U64(value)); - } - - #[allow(unused)] - pub fn append_u48(&mut self, value: [u8; 6]) { - self.packeds.push(Packed::U48(value)); - } - - pub fn append_field(&mut self, value: Fp) { - self.fields.push(value); - } - - pub fn append_bytes(&mut self, value: &[u8]) { - const BITS: [u8; 8] = [1, 2, 4, 8, 16, 32, 64, 128]; - - self.packeds.reserve(value.len() * 8); - - for byte in value { - for bit in BITS { - self.append_bool(byte & bit != 0); - } - } - } - - #[allow(clippy::wrong_self_convention)] - pub fn to_fields(mut self) -> Vec { - let mut nbits = 0; - let mut current: BigInteger256 = 0.into(); - - for (item, item_nbits) in self.packeds.iter().map(|i| (i.as_bigint(), i.nbits())) { - nbits += item_nbits; - - if nbits < 255 { - current.muln(item_nbits); - - // Addition, but we use 'bitwise or' because we know bits of - // `current` are zero (we just shift-left them) - current = BigInteger256([ - current.0[0] | item.0[0], - current.0[1] | item.0[1], - current.0[2] | item.0[2], - current.0[3] | item.0[3], - ]); - } else { - self.fields.push(current.try_into().unwrap()); // Never fail - current = item; - nbits = item_nbits; - } - } - - if nbits > 0 { - self.fields.push(current.try_into().unwrap()); // Never fail - } - - self.fields - } -} - #[cfg(test)] mod tests { use o1_utils::FieldHelpers; diff --git a/mina-p2p-messages/src/v2/hashing.rs b/mina-p2p-messages/src/v2/hashing.rs index b6e9196cc7..a1c02823ff 100644 --- a/mina-p2p-messages/src/v2/hashing.rs +++ b/mina-p2p-messages/src/v2/hashing.rs @@ -1,22 +1,18 @@ use std::{fmt, io}; -use ark_ff::{fields::arithmetic::InvalidBigInt, FromBytes}; +use ark_ff::fields::arithmetic::InvalidBigInt; use binprot::BinProtWrite; use binprot_derive::{BinProtRead, BinProtWrite}; use generated::MinaStateBlockchainStateValueStableV2; use mina_hasher::Fp; -use poseidon::ArithmeticSponge; +use poseidon::hash::{hash_with_kimchi, Inputs}; use serde::{Deserialize, Serialize}; use sha2::{ digest::{generic_array::GenericArray, typenum::U32}, Digest, Sha256, }; -use crate::{ - bigint::BigInt, - hash::MinaHash, - hash_input::{Inputs, ToInput}, -}; +use crate::{bigint::BigInt, hash::MinaHash, hash_input::FailableToInputs}; use super::{ generated, ConsensusBodyReferenceStableV1, ConsensusGlobalSlotStableV1, @@ -447,45 +443,7 @@ impl MinaHash for MinaStateProtocolStateValueStableV2 { } } -fn param_to_field_impl(param: &str, default: &[u8; 32]) -> Fp { - let param_bytes = param.as_bytes(); - let len = param_bytes.len(); - - let mut fp = *default; - fp[..len].copy_from_slice(param_bytes); - - Fp::read(&fp[..]).expect("fp read failed") -} - -const INPUT_PARAMS: &[u8; 32] = b"********************\0\0\0\0\0\0\0\0\0\0\0\0"; -const NO_INPUT_PARAMS: &[u8; 32] = &[0; 32]; - -fn param_to_field(param: &str, pad: &[u8; 32]) -> Fp { - if param.len() > 20 { - panic!("must be 20 byte maximum"); - } - - param_to_field_impl(param, pad) -} - -pub fn hash_noinputs(param: &str) -> Fp { - let mut sponge = ArithmeticSponge::::default(); - - sponge.absorb(&[param_to_field(param, NO_INPUT_PARAMS)]); - sponge.squeeze() -} - -pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = ArithmeticSponge::::default(); - - sponge.absorb(&[param_to_field(param, INPUT_PARAMS)]); - sponge.squeeze(); - - sponge.absorb(fields); - sponge.squeeze() -} - -impl ToInput for MinaStateProtocolStateBodyValueStableV2 { +impl FailableToInputs for MinaStateProtocolStateBodyValueStableV2 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaStateProtocolStateBodyValueStableV2 { genesis_state_hash, @@ -502,7 +460,7 @@ impl ToInput for MinaStateProtocolStateBodyValueStableV2 { } } -impl ToInput for MinaBaseProtocolConstantsCheckedValueStableV1 { +impl FailableToInputs for MinaBaseProtocolConstantsCheckedValueStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaBaseProtocolConstantsCheckedValueStableV1 { k, @@ -523,7 +481,7 @@ impl ToInput for MinaBaseProtocolConstantsCheckedValueStableV1 { } } -impl ToInput for MinaStateBlockchainStateValueStableV2 { +impl FailableToInputs for MinaStateBlockchainStateValueStableV2 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaStateBlockchainStateValueStableV2 { staged_ledger_hash, @@ -543,7 +501,7 @@ impl ToInput for MinaStateBlockchainStateValueStableV2 { } } -impl ToInput for ConsensusProofOfStakeDataConsensusStateValueStableV2 { +impl FailableToInputs for ConsensusProofOfStakeDataConsensusStateValueStableV2 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let ConsensusProofOfStakeDataConsensusStateValueStableV2 { blockchain_length, @@ -581,7 +539,7 @@ impl ToInput for ConsensusProofOfStakeDataConsensusStateValueStableV2 { } } -impl ToInput for MinaBaseStagedLedgerHashStableV1 { +impl FailableToInputs for MinaBaseStagedLedgerHashStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaBaseStagedLedgerHashStableV1 { non_snark, @@ -593,14 +551,14 @@ impl ToInput for MinaBaseStagedLedgerHashStableV1 { } } -impl ToInput for MinaBaseStagedLedgerHashNonSnarkStableV1 { +impl FailableToInputs for MinaBaseStagedLedgerHashNonSnarkStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_bytes(self.sha256().as_ref()); Ok(()) } } -impl ToInput for MinaStateBlockchainStateValueStableV2LedgerProofStatement { +impl FailableToInputs for MinaStateBlockchainStateValueStableV2LedgerProofStatement { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaStateBlockchainStateValueStableV2LedgerProofStatement { source, @@ -621,14 +579,14 @@ impl ToInput for MinaStateBlockchainStateValueStableV2LedgerProofStatement { } } -impl ToInput for ConsensusBodyReferenceStableV1 { +impl FailableToInputs for ConsensusBodyReferenceStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_bytes(self.as_ref()); Ok(()) } } -impl ToInput for ConsensusVrfOutputTruncatedStableV1 { +impl FailableToInputs for ConsensusVrfOutputTruncatedStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let vrf: &[u8] = self.as_ref(); inputs.append_bytes(&vrf[..31]); @@ -641,7 +599,7 @@ impl ToInput for ConsensusVrfOutputTruncatedStableV1 { } } -impl ToInput for ConsensusGlobalSlotStableV1 { +impl FailableToInputs for ConsensusGlobalSlotStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let ConsensusGlobalSlotStableV1 { slot_number, @@ -653,7 +611,7 @@ impl ToInput for ConsensusGlobalSlotStableV1 { } } -impl ToInput for ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { +impl FailableToInputs for ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1 { ledger, @@ -671,7 +629,7 @@ impl ToInput for ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueSta } } -impl ToInput for ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { +impl FailableToInputs for ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1 { ledger, @@ -689,7 +647,7 @@ impl ToInput for ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStable } } -impl ToInput for NonZeroCurvePointUncompressedStableV1 { +impl FailableToInputs for NonZeroCurvePointUncompressedStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let NonZeroCurvePointUncompressedStableV1 { x, is_odd } = self; x.to_input(inputs)?; @@ -698,7 +656,7 @@ impl ToInput for NonZeroCurvePointUncompressedStableV1 { } } -impl ToInput for MinaStateBlockchainStateValueStableV2LedgerProofStatementSource { +impl FailableToInputs for MinaStateBlockchainStateValueStableV2LedgerProofStatementSource { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaStateBlockchainStateValueStableV2LedgerProofStatementSource { first_pass_ledger, @@ -714,7 +672,7 @@ impl ToInput for MinaStateBlockchainStateValueStableV2LedgerProofStatementSource } } -impl ToInput for SignedAmount { +impl FailableToInputs for SignedAmount { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let SignedAmount { magnitude, sgn } = self; magnitude.to_input(inputs)?; @@ -723,7 +681,7 @@ impl ToInput for SignedAmount { } } -impl ToInput for MinaBaseFeeExcessStableV1 { +impl FailableToInputs for MinaBaseFeeExcessStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaBaseFeeExcessStableV1(left, right) = self; left.to_input(inputs)?; @@ -732,7 +690,7 @@ impl ToInput for MinaBaseFeeExcessStableV1 { } } -impl ToInput for TokenFeeExcess { +impl FailableToInputs for TokenFeeExcess { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let TokenFeeExcess { token, amount } = self; token.to_input(inputs)?; @@ -741,7 +699,7 @@ impl ToInput for TokenFeeExcess { } } -impl ToInput for MinaBaseEpochLedgerValueStableV1 { +impl FailableToInputs for MinaBaseEpochLedgerValueStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaBaseEpochLedgerValueStableV1 { hash, @@ -753,7 +711,7 @@ impl ToInput for MinaBaseEpochLedgerValueStableV1 { } } -impl ToInput for MinaBasePendingCoinbaseStackVersionedStableV1 { +impl FailableToInputs for MinaBasePendingCoinbaseStackVersionedStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaBasePendingCoinbaseStackVersionedStableV1 { data, state } = self; data.to_input(inputs)?; @@ -762,7 +720,7 @@ impl ToInput for MinaBasePendingCoinbaseStackVersionedStableV1 { } } -impl ToInput for MinaBasePendingCoinbaseStateStackStableV1 { +impl FailableToInputs for MinaBasePendingCoinbaseStateStackStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaBasePendingCoinbaseStateStackStableV1 { init, curr } = self; init.to_input(inputs)?; @@ -771,7 +729,7 @@ impl ToInput for MinaBasePendingCoinbaseStateStackStableV1 { } } -impl ToInput for MinaTransactionLogicZkappCommandLogicLocalStateValueStableV1 { +impl FailableToInputs for MinaTransactionLogicZkappCommandLogicLocalStateValueStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaTransactionLogicZkappCommandLogicLocalStateValueStableV1 { stack_frame, @@ -800,14 +758,14 @@ impl ToInput for MinaTransactionLogicZkappCommandLogicLocalStateValueStableV1 { } } -impl ToInput for SgnStableV1 { +impl FailableToInputs for SgnStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { inputs.append_bool(self == &SgnStableV1::Pos); Ok(()) } } -impl ToInput for MinaNumbersGlobalSlotSinceGenesisMStableV1 { +impl FailableToInputs for MinaNumbersGlobalSlotSinceGenesisMStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { match self { MinaNumbersGlobalSlotSinceGenesisMStableV1::SinceGenesis(v) => v.to_input(inputs), @@ -815,7 +773,7 @@ impl ToInput for MinaNumbersGlobalSlotSinceGenesisMStableV1 { } } -impl ToInput for MinaStateBlockchainStateValueStableV2SignedAmount { +impl FailableToInputs for MinaStateBlockchainStateValueStableV2SignedAmount { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { let MinaStateBlockchainStateValueStableV2SignedAmount { magnitude, sgn } = self; magnitude.to_input(inputs)?; @@ -824,7 +782,7 @@ impl ToInput for MinaStateBlockchainStateValueStableV2SignedAmount { } } -impl ToInput for MinaNumbersGlobalSlotSinceHardForkMStableV1 { +impl FailableToInputs for MinaNumbersGlobalSlotSinceHardForkMStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { match self { MinaNumbersGlobalSlotSinceHardForkMStableV1::SinceHardFork(v) => v.to_input(inputs), @@ -832,7 +790,7 @@ impl ToInput for MinaNumbersGlobalSlotSinceHardForkMStableV1 { } } -impl ToInput for MinaNumbersGlobalSlotSpanStableV1 { +impl FailableToInputs for MinaNumbersGlobalSlotSpanStableV1 { fn to_input(&self, inputs: &mut Inputs) -> Result<(), InvalidBigInt> { match self { MinaNumbersGlobalSlotSpanStableV1::GlobalSlotSpan(v) => v.to_input(inputs), diff --git a/mina-p2p-messages/src/v2/manual.rs b/mina-p2p-messages/src/v2/manual.rs index de8e4c8c3a..e138b4853d 100644 --- a/mina-p2p-messages/src/v2/manual.rs +++ b/mina-p2p-messages/src/v2/manual.rs @@ -544,7 +544,7 @@ impl CoinbaseStackData { pub fn empty() -> Self { // In OCaml: https://github.com/MinaProtocol/mina/blob/68b49fdaafabed0f2cd400c4c69f91e81db681e7/src/lib/mina_base/pending_coinbase.ml#L186 // let empty = Random_oracle.salt "CoinbaseStack" |> Random_oracle.digest - let empty = super::hashing::hash_noinputs("CoinbaseStack"); + let empty = poseidon::hash::hash_noinputs("CoinbaseStack"); MinaBasePendingCoinbaseCoinbaseStackStableV1(empty.into()).into() } } diff --git a/node/Cargo.toml b/node/Cargo.toml index 99ec0ed539..1348138e64 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -24,6 +24,7 @@ redux = { workspace = true } multihash = { version = "0.18.1", features = ["blake2b"] } mina-hasher = { workspace = true } mina-signer = { workspace = true } +poseidon = { workspace = true } ledger = { workspace = true } mina-p2p-messages = { workspace = true } vrf = { workspace = true } diff --git a/node/src/block_producer/mod.rs b/node/src/block_producer/mod.rs index e9630f9ba2..5a4850a514 100644 --- a/node/src/block_producer/mod.rs +++ b/node/src/block_producer/mod.rs @@ -213,6 +213,6 @@ pub fn calc_epoch_seed( ) -> v2::EpochSeed { // TODO(adonagy): fix this unwrap let old_seed = prev_epoch_seed.to_field().unwrap(); - let new_seed = ledger::hash_with_kimchi("MinaEpochSeed", &[old_seed, vrf_hash]); + let new_seed = poseidon::hash::hash_with_kimchi("MinaEpochSeed", &[old_seed, vrf_hash]); v2::MinaBaseEpochSeedStableV1(new_seed.into()).into() } diff --git a/poseidon/src/hash.rs b/poseidon/src/hash.rs new file mode 100644 index 0000000000..75db541339 --- /dev/null +++ b/poseidon/src/hash.rs @@ -0,0 +1,224 @@ +use ark_ff::{BigInteger as _, BigInteger256, Field, FromBytes as _}; +use mina_curves::pasta::Fp; + +use crate::{Sponge, SpongeParamsForField}; + +enum Item { + Bool(bool), + U2(u8), + U8(u8), + U32(u32), + U48([u8; 6]), + U64(u64), +} + +impl std::fmt::Debug for Item { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Self::Bool(arg0) => f.write_fmt(format_args!("{}_bool", i32::from(*arg0))), + Self::U2(arg0) => f.write_fmt(format_args!("{}_u2", arg0)), + Self::U8(arg0) => f.write_fmt(format_args!("{}_u8", arg0)), + Self::U32(arg0) => f.write_fmt(format_args!("{}_u32", arg0)), + Self::U48(arg0) => f.write_fmt(format_args!("{:?}_u48", arg0)), + Self::U64(arg0) => f.write_fmt(format_args!("{}_u64", arg0)), + } + } +} + +impl Item { + fn nbits(&self) -> u32 { + match self { + Item::Bool(_) => 1, + Item::U2(_) => 2, + Item::U8(_) => 8, + Item::U32(_) => 32, + Item::U48(_) => 48, + Item::U64(_) => 64, + } + } + + fn as_bigint(&self) -> BigInteger256 { + match self { + Item::Bool(v) => { + if *v { + 1.into() + } else { + 0.into() + } + } + Item::U2(v) => (*v as u64).into(), + Item::U8(v) => (*v as u64).into(), + Item::U32(v) => (*v as u64).into(), + Item::U48(v) => { + let mut bytes = <[u8; 32]>::default(); + bytes[..6].copy_from_slice(&v[..]); + BigInteger256::read(&bytes[..]).unwrap() // Never fail with only 6 bytes + } + Item::U64(v) => (*v).into(), + } + } +} + +pub struct Inputs { + fields: Vec, + packeds: Vec, +} + +impl Default for Inputs { + fn default() -> Self { + Self::new() + } +} + +impl std::fmt::Debug for Inputs { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("Inputs") + .field(&format!("fields[{:?}]", self.fields.len()), &self.fields) + .field(&format!("packeds[{:?}]", self.packeds.len()), &self.packeds) + .finish() + } +} + +impl Inputs { + pub fn new() -> Self { + Self { + fields: Vec::with_capacity(256), + packeds: Vec::with_capacity(256), + } + } + + pub fn append_bool(&mut self, value: bool) { + self.packeds.push(Item::Bool(value)); + } + + pub fn append_u2(&mut self, value: u8) { + self.packeds.push(Item::U2(value)); + } + + pub fn append_u8(&mut self, value: u8) { + self.packeds.push(Item::U8(value)); + } + + pub fn append_u32(&mut self, value: u32) { + self.packeds.push(Item::U32(value)); + } + + pub fn append_u64(&mut self, value: u64) { + self.packeds.push(Item::U64(value)); + } + + pub fn append_u48(&mut self, value: [u8; 6]) { + self.packeds.push(Item::U48(value)); + } + + pub fn append_field(&mut self, value: Fp) { + self.fields.push(value); + } + + pub fn append_bytes(&mut self, value: &[u8]) { + const BITS: [u8; 8] = [1, 2, 4, 8, 16, 32, 64, 128]; + + self.packeds.reserve(value.len() * 8); + + for byte in value { + for bit in BITS { + self.append_bool(byte & bit != 0); + } + } + } + + // pub fn append(&mut self, value: &T) + // where + // T: ToInputs, + // { + // value.to_inputs(self); + // } + + #[allow(clippy::wrong_self_convention)] + pub fn to_fields(mut self) -> Vec { + let mut nbits = 0; + let mut current: BigInteger256 = 0.into(); + + for (item, item_nbits) in self.packeds.iter().map(|i| (i.as_bigint(), i.nbits())) { + nbits += item_nbits; + + if nbits < 255 { + current.muln(item_nbits); + + // Addition, but we use 'bitwise or' because we know bits of + // `current` are zero (we just shift-left them) + current = BigInteger256([ + current.0[0] | item.0[0], + current.0[1] | item.0[1], + current.0[2] | item.0[2], + current.0[3] | item.0[3], + ]); + } else { + self.fields.push(current.try_into().unwrap()); // Never fail + current = item; + nbits = item_nbits; + } + } + + if nbits > 0 { + self.fields.push(current.try_into().unwrap()); // Never fail + } + + self.fields + } +} + +fn param_to_field_impl(param: &str, default: &[u8; 32]) -> Fp { + let param_bytes = param.as_bytes(); + let len = param_bytes.len(); + + let mut fp = *default; + fp[..len].copy_from_slice(param_bytes); + + Fp::read(&fp[..]).expect("fp read failed") +} + +pub fn param_to_field(param: &str) -> Fp { + const DEFAULT: &[u8; 32] = b"********************\0\0\0\0\0\0\0\0\0\0\0\0"; + + if param.len() > 20 { + panic!("must be 20 byte maximum"); + } + + param_to_field_impl(param, DEFAULT) +} + +fn param_to_field_noinputs(param: &str) -> Fp { + const DEFAULT: &[u8; 32] = &[0; 32]; + + if param.len() > 32 { + panic!("must be 32 byte maximum"); + } + + param_to_field_impl(param, DEFAULT) +} + +pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { + let mut sponge = Sponge::::default(); + + sponge.absorb(&[param_to_field(param)]); + sponge.squeeze(); + + sponge.absorb(fields); + sponge.squeeze() +} + +pub fn hash_fields>(fields: &[F]) -> F { + let mut sponge = Sponge::::default(); + + sponge.absorb(fields); + sponge.squeeze() +} + +pub fn hash_noinputs(param: &str) -> Fp { + let mut sponge = Sponge::::default(); + // ArithmeticSponge::::new(pasta::fp_kimchi::static_params()); + + sponge.absorb(&[param_to_field_noinputs(param)]); + sponge.squeeze() +} diff --git a/poseidon/src/lib.rs b/poseidon/src/lib.rs index a1aa5ee850..17f6fc2288 100644 --- a/poseidon/src/lib.rs +++ b/poseidon/src/lib.rs @@ -5,6 +5,7 @@ use std::marker::PhantomData; use ark_ff::{BigInteger256, Field}; use mina_curves::pasta::{Fp, Fq}; +pub mod hash; mod params; pub use params::*; @@ -51,7 +52,7 @@ impl SpongeConstants for PlonkSpongeConstantsLegacy { const PERM_INITIAL_ARK: bool = true; } -fn apply_mds_matrix(params: &ArithmeticSpongeParams, state: &[F]) -> [F; 3] { +fn apply_mds_matrix(params: &SpongeParams, state: &[F]) -> [F; 3] { let mut new_state = [F::zero(); 3]; for (i, sub_params) in params.mds.iter().enumerate() { @@ -64,7 +65,7 @@ fn apply_mds_matrix(params: &ArithmeticSpongeParams, state: &[F]) - } pub fn full_round( - params: &ArithmeticSpongeParams, + params: &SpongeParams, state: &mut [F; 3], r: usize, ) { @@ -78,7 +79,7 @@ pub fn full_round( } pub fn poseidon_block_cipher( - params: &ArithmeticSpongeParams, + params: &SpongeParams, state: &mut [F; 3], ) { if SC::PERM_INITIAL_ARK { @@ -120,45 +121,45 @@ pub enum SpongeState { } #[derive(Debug)] -pub struct ArithmeticSpongeParams { +pub struct SpongeParams { pub round_constants: Box<[[F; 3]]>, pub mds: [[F; 3]; 3], } pub trait SpongeParamsForField { - fn get_params() -> &'static ArithmeticSpongeParams; + fn get_params() -> &'static SpongeParams; } impl SpongeParamsForField for Fp { - fn get_params() -> &'static ArithmeticSpongeParams { + fn get_params() -> &'static SpongeParams { fp::params() } } impl SpongeParamsForField for Fq { - fn get_params() -> &'static ArithmeticSpongeParams { + fn get_params() -> &'static SpongeParams { fq::params() } } #[derive(Clone)] -pub struct ArithmeticSponge { +pub struct Sponge { pub sponge_state: SpongeState, rate: usize, pub state: [F; 3], - params: &'static ArithmeticSpongeParams, + params: &'static SpongeParams, constants: PhantomData, } -impl, C: SpongeConstants> Default for ArithmeticSponge { +impl, C: SpongeConstants> Default for Sponge { fn default() -> Self { Self::new_with_params(F::get_params()) } } -impl, C: SpongeConstants> ArithmeticSponge { - pub fn new_with_params(params: &'static ArithmeticSpongeParams) -> ArithmeticSponge { - ArithmeticSponge { +impl, C: SpongeConstants> Sponge { + pub fn new_with_params(params: &'static SpongeParams) -> Sponge { + Sponge { state: [F::zero(); 3], rate: C::SPONGE_RATE, sponge_state: SpongeState::Absorbed(0), @@ -232,14 +233,14 @@ impl, C: SpongeConstants> ArithmeticSponge { - sponge: ArithmeticSponge, + sponge: Sponge, last_squeezed: Vec, } impl + Into> Default for FqSponge { fn default() -> Self { Self { - sponge: ArithmeticSponge::default(), + sponge: Sponge::default(), last_squeezed: Vec::with_capacity(8), } } diff --git a/poseidon/src/params.rs b/poseidon/src/params.rs index 4264402359..05d449cf4e 100644 --- a/poseidon/src/params.rs +++ b/poseidon/src/params.rs @@ -3,13 +3,13 @@ use std::str::FromStr; use mina_curves::pasta::{Fp, Fq}; use once_cell::sync::Lazy; -use crate::ArithmeticSpongeParams; +use crate::SpongeParams; pub mod fq { use super::*; - fn make_params() -> ArithmeticSpongeParams { - ArithmeticSpongeParams { + fn make_params() -> SpongeParams { + SpongeParams { mds: [ [ Fq::from_str( @@ -829,8 +829,8 @@ pub mod fq { } } - pub fn params() -> &'static ArithmeticSpongeParams { - static PARAMS: Lazy> = Lazy::new(make_params); + pub fn params() -> &'static SpongeParams { + static PARAMS: Lazy> = Lazy::new(make_params); &PARAMS } } @@ -838,8 +838,8 @@ pub mod fq { pub mod fp { use super::*; - fn make_params() -> ArithmeticSpongeParams { - ArithmeticSpongeParams { + fn make_params() -> SpongeParams { + SpongeParams { mds: [ [ Fp::from_str( @@ -1660,8 +1660,8 @@ pub mod fp { } } - pub fn params() -> &'static ArithmeticSpongeParams { - static PARAMS: Lazy> = Lazy::new(make_params); + pub fn params() -> &'static SpongeParams { + static PARAMS: Lazy> = Lazy::new(make_params); &PARAMS } } @@ -1669,8 +1669,8 @@ pub mod fp { pub mod fp_legacy { use super::*; - fn make_params() -> ArithmeticSpongeParams { - ArithmeticSpongeParams { + fn make_params() -> SpongeParams { + SpongeParams { mds: [ [ Fp::from_str( @@ -3120,8 +3120,8 @@ pub mod fp_legacy { } } - pub fn params() -> &'static ArithmeticSpongeParams { - static PARAMS: Lazy> = Lazy::new(make_params); + pub fn params() -> &'static SpongeParams { + static PARAMS: Lazy> = Lazy::new(make_params); &PARAMS } } diff --git a/snark/Cargo.toml b/snark/Cargo.toml index 240ba97771..67881988a9 100644 --- a/snark/Cargo.toml +++ b/snark/Cargo.toml @@ -25,6 +25,7 @@ hex = "0.4" redux = { workspace = true } ledger = { workspace = true } mina-p2p-messages = { workspace = true } +poseidon = { workspace = true } sha2 = "0.10" num-bigint = "0.4" thiserror = "1.0.50" diff --git a/snark/src/merkle_path/mod.rs b/snark/src/merkle_path/mod.rs index 71c748b44d..37be1bfdc4 100644 --- a/snark/src/merkle_path/mod.rs +++ b/snark/src/merkle_path/mod.rs @@ -24,7 +24,7 @@ pub fn calc_merkle_root_hash( param.clear(); write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); - child_hash = ledger::hash_with_kimchi(param.as_str(), &hashes) + child_hash = poseidon::hash::hash_with_kimchi(param.as_str(), &hashes) } Ok(child_hash.into()) From fd22fa566fa003859853ae21daf562584900a65e Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Fri, 22 Nov 2024 19:19:09 +0400 Subject: [PATCH 101/175] fix(node): incorrect action count --- node/src/action_kind.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 93347778ca..1009e04c8b 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -716,7 +716,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 597; + pub const COUNT: u16 = 599; } impl std::fmt::Display for ActionKind { From 8c72f9571d45fa43e5772537091dc0a54559bbbc Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Fri, 22 Nov 2024 16:30:37 +0100 Subject: [PATCH 102/175] Fix elided lifetimes --- ledger/src/scan_state/scan_state.rs | 2 +- node/testing/src/scenarios/driver.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ledger/src/scan_state/scan_state.rs b/ledger/src/scan_state/scan_state.rs index cabb76037a..9dacfc9abd 100644 --- a/ledger/src/scan_state/scan_state.rs +++ b/ledger/src/scan_state/scan_state.rs @@ -2365,7 +2365,7 @@ impl ScanState { } } -pub fn group_list<'a, F, T, R>(slice: &'a [T], fun: F) -> impl Iterator> + '_ +pub fn group_list<'a, F, T, R>(slice: &'a [T], fun: F) -> impl Iterator> + 'a where F: Fn(&'a T) -> R + 'a, { diff --git a/node/testing/src/scenarios/driver.rs b/node/testing/src/scenarios/driver.rs index 2a33c94b12..364168e275 100644 --- a/node/testing/src/scenarios/driver.rs +++ b/node/testing/src/scenarios/driver.rs @@ -734,7 +734,7 @@ pub fn peer_is_ready( ) } -pub fn get_p2p_state<'a>(cluster: &'a ClusterRunner<'a>, node_id: ClusterNodeId) -> &P2pState { +pub fn get_p2p_state<'a>(cluster: &'a ClusterRunner<'a>, node_id: ClusterNodeId) -> &'a P2pState { cluster .node(node_id) .expect("node should exist") From 376cc191efb95ae5d533ba201f5f96ff8a154ea9 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Sat, 23 Nov 2024 17:12:25 +0100 Subject: [PATCH 103/175] Move `LegacyInput` into `poseidon` --- ledger/src/proofs/transaction.rs | 71 ++---------- ledger/src/scan_state/transaction_logic.rs | 125 ++++++--------------- ledger/src/verifier/mod.rs | 41 ++++++- poseidon/src/hash.rs | 91 +++++++++++++++ poseidon/src/lib.rs | 7 ++ 5 files changed, 179 insertions(+), 156 deletions(-) diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index 91d28c6254..7863335739 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -1514,6 +1514,7 @@ pub mod legacy_input { use crate::scan_state::transaction_logic::transaction_union_payload::{ Body, Common, TransactionUnionPayload, }; + use ::poseidon::hash::legacy; use super::*; @@ -1552,68 +1553,15 @@ pub mod legacy_input { } pub trait CheckedLegacyInput { - fn to_checked_legacy_input(&self, inputs: &mut LegacyInput, w: &mut Witness); + fn to_checked_legacy_input(&self, inputs: &mut legacy::Inputs, w: &mut Witness); - fn to_checked_legacy_input_owned(&self, w: &mut Witness) -> LegacyInput { - let mut inputs = LegacyInput::new(); + fn to_checked_legacy_input_owned(&self, w: &mut Witness) -> legacy::Inputs { + let mut inputs = legacy::Inputs::new(); self.to_checked_legacy_input(&mut inputs, w); inputs } } - #[derive(Clone, Debug)] - pub struct LegacyInput { - fields: Vec, - bits: Vec, - } - - impl Default for LegacyInput { - fn default() -> Self { - Self::new() - } - } - - impl LegacyInput { - pub fn new() -> Self { - Self { - fields: Vec::with_capacity(256), - bits: Vec::with_capacity(1024), - } - } - - pub fn append_bit(&mut self, bit: bool) { - self.bits.push(bit); - } - - pub fn append_bits(&mut self, bits: &[bool]) { - self.bits.extend(bits); - } - - pub fn append_field(&mut self, field: F) { - self.fields.push(field); - } - - pub fn to_fields(mut self) -> Vec { - const NBITS: usize = 255 - 1; - - self.fields.reserve(self.bits.len() / NBITS); - self.fields.extend(self.bits.chunks(NBITS).map(|bits| { - assert!(bits.len() <= NBITS); - - let mut field = [0u64; 4]; - - for (index, bit) in bits.iter().enumerate() { - let limb_index = index / 64; - let bit_index = index % 64; - field[limb_index] |= (*bit as u64) << bit_index; - } - - F::try_from(BigInteger256::new(field)).unwrap() // Never fail - })); - self.fields - } - } - const LEGACY_DEFAULT_TOKEN: [bool; 64] = { let mut default = [false; 64]; default[0] = true; @@ -1621,7 +1569,7 @@ pub mod legacy_input { }; impl CheckedLegacyInput for TransactionUnionPayload { - fn to_checked_legacy_input(&self, inputs: &mut LegacyInput, w: &mut Witness) { + fn to_checked_legacy_input(&self, inputs: &mut legacy::Inputs, w: &mut Witness) { let Self { common: Common { @@ -2298,10 +2246,11 @@ pub mod transaction_snark { currency, transaction_logic::transaction_union_payload::{TransactionUnion, TransactionUnionPayload}, }; + use ::poseidon::hash::legacy; use mina_signer::Signature; use openmina_core::constants::constraint_constants; - use super::{legacy_input::LegacyInput, *}; + use super::*; mod user_command_failure { use crate::scan_state::{ @@ -2564,7 +2513,7 @@ pub mod transaction_snark { } } - pub fn checked_legacy_hash(param: &str, inputs: LegacyInput, w: &mut Witness) -> Fp { + pub fn checked_legacy_hash(param: &str, inputs: legacy::Inputs, w: &mut Witness) -> Fp { use ::poseidon::fp_legacy::params; use ::poseidon::hash::param_to_field; use ::poseidon::PlonkSpongeConstantsLegacy as Constants; @@ -2622,7 +2571,7 @@ pub mod transaction_snark { } fn checked_legacy_signature_hash( - mut inputs: LegacyInput, + mut inputs: legacy::Inputs, signer: &PubKey, signature: &Signature, w: &mut Witness, @@ -2643,7 +2592,7 @@ pub mod transaction_snark { shifted: &InnerCurve, signer: &PubKey, signature: &Signature, - inputs: LegacyInput, + inputs: legacy::Inputs, w: &mut Witness, ) -> Boolean { let hash = checked_legacy_signature_hash(inputs, signer, signature, w); diff --git a/ledger/src/scan_state/transaction_logic.rs b/ledger/src/scan_state/transaction_logic.rs index e7b3155b6f..68c2e7e51b 100644 --- a/ledger/src/scan_state/transaction_logic.rs +++ b/ledger/src/scan_state/transaction_logic.rs @@ -4,7 +4,7 @@ use std::fmt::Display; use ark_ff::fields::arithmetic::InvalidBigInt; use ark_ff::Zero; use itertools::{FoldWhile, Itertools}; -use mina_hasher::{create_kimchi, Fp}; +use mina_hasher::Fp; use mina_p2p_messages::binprot; use mina_p2p_messages::v2::{MinaBaseUserCommandStableV2, MinaTransactionTransactionStableV2}; use mina_signer::CompressedPubKey; @@ -620,31 +620,12 @@ impl Memo { } pub fn hash(&self) -> Fp { - use mina_hasher::ROInput as LegacyInput; + use ::poseidon::hash::{hash_with_kimchi, legacy}; - let inputs = LegacyInput::new(); - let inputs = inputs.append_bytes(&self.0); - - use mina_hasher::{Hashable, Hasher, ROInput}; - - #[derive(Clone)] - struct MyInput(LegacyInput); - - impl Hashable for MyInput { - type D = (); - - fn to_roinput(&self) -> ROInput { - self.0.clone() - } - - fn domain_string(_: Self::D) -> Option { - Some("MinaZkappMemo".to_string()) - } - } - - let mut hasher = create_kimchi::(()); - hasher.update(&MyInput(inputs)); - hasher.digest() + // For some reason we are mixing legacy inputs and "new" hashing + let mut inputs = legacy::Inputs::new(); + inputs.append_bytes(&self.0); + hash_with_kimchi("MinaZkappMemo", &inputs.to_fields()) } pub fn as_slice(&self) -> &[u8] { @@ -4218,24 +4199,6 @@ pub mod zkapp_statement { } } - impl mina_hasher::Hashable for TransactionCommitment { - type D = mina_signer::NetworkId; - - fn to_roinput(&self) -> mina_hasher::ROInput { - mina_hasher::ROInput::new().append_field(self.0) - } - - fn domain_string(network_id: mina_signer::NetworkId) -> Option { - // Domain strings must have length <= 20 - match network_id { - mina_signer::NetworkId::MAINNET => "MinaSignatureMainnet", - mina_signer::NetworkId::TESTNET => "CodaSignature", - } - .to_string() - .into() - } - } - #[derive(Clone, Debug)] pub struct ZkappStatement { pub account_update: TransactionCommitment, @@ -4289,7 +4252,6 @@ pub mod verifiable { use std::ops::Neg; use ark_ff::{BigInteger, PrimeField}; - use mina_signer::Signer; use super::*; @@ -4328,13 +4290,7 @@ pub mod verifiable { let payload = TransactionUnionPayload::of_user_command_payload(payload); let pubkey = compressed_to_pubkey(pubkey); - let network_id = match openmina_core::NetworkConfig::global().network_id { - openmina_core::network::NetworkId::TESTNET => mina_signer::NetworkId::TESTNET, - openmina_core::network::NetworkId::MAINNET => mina_signer::NetworkId::MAINNET, - }; - let mut signer = mina_signer::create_legacy(network_id); - - if signer.verify(signature, &pubkey, &payload) { + if crate::verifier::common::legacy_verify_signature(signature, &pubkey, &payload) { Ok(valid::UserCommand::SignedCommand(cmd)) } else { Err(cmd) @@ -7353,32 +7309,32 @@ pub mod transaction_union_payload { } /// https://github.com/MinaProtocol/mina/blob/2ee6e004ba8c6a0541056076aab22ea162f7eb3a/src/lib/mina_base/transaction_union_payload.ml#L309 - pub fn to_input_legacy(&self) -> LegacyInput { - let mut roi = LegacyInput::new(); + pub fn to_input_legacy(&self) -> ::poseidon::hash::legacy::Inputs { + let mut roi = ::poseidon::hash::legacy::Inputs::new(); // Self.common { - roi = roi.append_u64(self.common.fee.0); + roi.append_u64(self.common.fee.0); // TokenId.default // https://github.com/MinaProtocol/mina/blob/2ee6e004ba8c6a0541056076aab22ea162f7eb3a/src/lib/mina_base/signed_command_payload.ml#L19 - roi = roi.append_bool(true); + roi.append_bool(true); for _ in 0..63 { - roi = roi.append_bool(false); + roi.append_bool(false); } // fee_payer_pk - roi = roi.append_field(self.common.fee_payer_pk.x); - roi = roi.append_bool(self.common.fee_payer_pk.is_odd); + roi.append_field(self.common.fee_payer_pk.x); + roi.append_bool(self.common.fee_payer_pk.is_odd); // nonce - roi = roi.append_u32(self.common.nonce.0); + roi.append_u32(self.common.nonce.0); // valid_until - roi = roi.append_u32(self.common.valid_until.0); + roi.append_u32(self.common.valid_until.0); // memo - roi = roi.append_bytes(&self.common.memo.0); + roi.append_bytes(&self.common.memo.0); } // Self.body @@ -7386,25 +7342,25 @@ pub mod transaction_union_payload { // tag let tag = self.body.tag.clone() as u8; for bit in [4, 2, 1] { - roi = roi.append_bool(tag & bit != 0); + roi.append_bool(tag & bit != 0); } // source_pk - roi = roi.append_field(self.body.source_pk.x); - roi = roi.append_bool(self.body.source_pk.is_odd); + roi.append_field(self.body.source_pk.x); + roi.append_bool(self.body.source_pk.is_odd); // receiver_pk - roi = roi.append_field(self.body.receiver_pk.x); - roi = roi.append_bool(self.body.receiver_pk.is_odd); + roi.append_field(self.body.receiver_pk.x); + roi.append_bool(self.body.receiver_pk.is_odd); // default token_id - roi = roi.append_u64(1); + roi.append_u64(1); // amount - roi = roi.append_u64(self.body.amount.0); + roi.append_u64(self.body.amount.0); // token_locked - roi = roi.append_bool(false); + roi.append_bool(false); } roi @@ -7541,35 +7497,18 @@ pub fn cons_signed_command_payload( command_payload: &SignedCommandPayload, last_receipt_chain_hash: ReceiptChainHash, ) -> ReceiptChainHash { - // Note: Not sure why the use the legacy way of hashing here + // Note: Not sure why they use the legacy way of hashing here - use mina_hasher::ROInput as LegacyInput; + use ::poseidon::hash::legacy; + let ReceiptChainHash(last_receipt_chain_hash) = last_receipt_chain_hash; let union = TransactionUnionPayload::of_user_command_payload(command_payload); - let inputs = union.to_input_legacy(); - let inputs = inputs.append_field(last_receipt_chain_hash.0); - - use mina_hasher::{create_legacy, Hashable, Hasher, ROInput}; - - #[derive(Clone)] - struct MyInput(LegacyInput); - - impl Hashable for MyInput { - type D = (); - - fn to_roinput(&self) -> ROInput { - self.0.clone() - } - - fn domain_string(_: Self::D) -> Option { - Some(ReceiptChainHash::HASH_PREFIX.to_string()) - } - } + let mut inputs = union.to_input_legacy(); + inputs.append_field(last_receipt_chain_hash); + let hash = legacy::hash_with_kimchi(ReceiptChainHash::HASH_PREFIX, &inputs.to_fields()); - let mut hasher = create_legacy::(()); - hasher.update(&MyInput(inputs)); - ReceiptChainHash(hasher.digest()) + ReceiptChainHash(hash) } /// Returns the new `receipt_chain_hash` diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs index fb057caab7..5b6179398d 100644 --- a/ledger/src/verifier/mod.rs +++ b/ledger/src/verifier/mod.rs @@ -237,6 +237,7 @@ pub mod common { use crate::{ decompress_pk, scan_state::transaction_logic::{ + transaction_union_payload::TransactionUnionPayload, valid, verifiable, zkapp_command::{self, valid::of_verifiable, AccountUpdate}, zkapp_statement::{TransactionCommitment, ZkappStatement}, @@ -371,8 +372,7 @@ pub mod common { } } - /// Verify signature with new style (chunked inputs) - /// `mina_signer::verify` is using old one + /// Verify zkapp signature/statement with new style (chunked inputs) fn verify_signature( signature: &Signature, pubkey: &PubKey, @@ -401,4 +401,41 @@ pub mod common { let rv = rv.into_affine(); rv.y.into_repr().is_even() && rv.x == *rx } + + /// Verify signature with legacy style + pub fn legacy_verify_signature( + signature: &Signature, + pubkey: &PubKey, + msg: &TransactionUnionPayload, + ) -> bool { + use ::poseidon::hash::legacy; + use ark_ec::{AffineCurve, ProjectiveCurve}; + use ark_ff::{BigInteger, PrimeField, Zero}; + use mina_curves::pasta::Fq; + use mina_curves::pasta::Pallas; + use mina_signer::CurvePoint; + use std::ops::Neg; + + let Pallas { x, y, .. } = pubkey.point(); + let Signature { rx, s } = signature; + + let signature_prefix = openmina_core::NetworkConfig::global().signature_prefix; + + let mut inputs = msg.to_input_legacy(); + inputs.append_field(*x); + inputs.append_field(*y); + inputs.append_field(*rx); + + let hash = legacy::hash_with_kimchi(signature_prefix, &inputs.to_fields()); + let hash: Fq = Fq::try_from(hash.into_repr()).unwrap(); // Never fail, `Fq` is larger than `Fp` + + let sv: CurvePoint = CurvePoint::prime_subgroup_generator().mul(*s).into_affine(); + // Perform addition and infinity check in projective coordinates for performance + let rv = pubkey.point().mul(hash).neg().add_mixed(&sv); + if rv.is_zero() { + return false; + } + let rv = rv.into_affine(); + rv.y.into_repr().is_even() && rv.x == *rx + } } diff --git a/poseidon/src/hash.rs b/poseidon/src/hash.rs index 75db541339..c5bacf331c 100644 --- a/poseidon/src/hash.rs +++ b/poseidon/src/hash.rs @@ -222,3 +222,94 @@ pub fn hash_noinputs(param: &str) -> Fp { sponge.absorb(&[param_to_field_noinputs(param)]); sponge.squeeze() } + +pub mod legacy { + use ark_ff::fields::arithmetic::InvalidBigInt; + + use super::*; + + #[derive(Clone, Debug)] + pub struct Inputs { + fields: Vec, + bits: Vec, + } + + impl Default for Inputs { + fn default() -> Self { + Self::new() + } + } + + impl Inputs { + pub fn new() -> Self { + Self { + fields: Vec::with_capacity(256), + bits: Vec::with_capacity(512), + } + } + + pub fn append_bit(&mut self, bit: bool) { + self.bits.push(bit); + } + + pub fn append_bool(&mut self, value: bool) { + self.append_bit(value); + } + + pub fn append_bits(&mut self, bits: &[bool]) { + self.bits.extend(bits); + } + + pub fn append_bytes(&mut self, bytes: &[u8]) { + const BITS: [u8; 8] = [1, 2, 4, 8, 16, 32, 64, 128]; + + self.bits.reserve(bytes.len() * 8); + + for byte in bytes { + for bit in BITS { + self.append_bit(byte & bit != 0); + } + } + } + + pub fn append_u64(&mut self, value: u64) { + self.append_bytes(&value.to_le_bytes()); + } + + pub fn append_u32(&mut self, value: u32) { + self.append_bytes(&value.to_le_bytes()); + } + + pub fn append_field(&mut self, field: F) { + self.fields.push(field); + } + } + + impl> Inputs { + pub fn to_fields(mut self) -> Vec { + const NBITS: usize = 255 - 1; + + self.fields.reserve(self.bits.len() / NBITS); + self.fields.extend(self.bits.chunks(NBITS).map(|bits| { + let mut field = [0u64; 4]; + for (index, bit) in bits.iter().enumerate() { + let limb_index = index / 64; + let bit_index = index % 64; + field[limb_index] |= (*bit as u64) << bit_index; + } + F::try_from(BigInteger256::new(field)).unwrap() // Never fail + })); + self.fields + } + } + + pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { + let mut sponge = Sponge::new_legacy(); + + sponge.absorb(&[param_to_field(param)]); + sponge.squeeze(); + + sponge.absorb(fields); + sponge.squeeze() + } +} diff --git a/poseidon/src/lib.rs b/poseidon/src/lib.rs index 17f6fc2288..5709ca8a8e 100644 --- a/poseidon/src/lib.rs +++ b/poseidon/src/lib.rs @@ -231,6 +231,13 @@ impl, C: SpongeConstants> Sponge { } } +impl Sponge { + pub fn new_legacy() -> Self { + use params::fp_legacy::params; + Sponge::::new_with_params(params()) + } +} + #[derive(Clone)] pub struct FqSponge { sponge: Sponge, From 7166d7a1411c84b83f008182a2486a8906978d2b Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Sat, 23 Nov 2024 22:30:55 +0100 Subject: [PATCH 104/175] Add `LazyParam` to cache poseidon prefixes --- Cargo.lock | 1 + core/Cargo.toml | 1 + core/src/network.rs | 28 +- ledger/src/account/account.rs | 29 +- ledger/src/hash.rs | 4 +- ledger/src/proofs/transaction.rs | 8 +- ledger/src/proofs/zkapp.rs | 9 +- ledger/src/scan_state/pending_coinbase.rs | 23 +- ledger/src/scan_state/protocol_state.rs | 10 +- ledger/src/scan_state/transaction_logic.rs | 71 +++-- .../src/sparse_ledger/sparse_ledger_impl.rs | 13 +- ledger/src/tree_version.rs | 6 +- ledger/src/verifier/mod.rs | 4 +- ledger/src/zkapps/snark.rs | 4 +- mina-p2p-messages/src/v2/hashing.rs | 13 +- mina-p2p-messages/src/v2/manual.rs | 3 +- node/src/block_producer/mod.rs | 3 +- poseidon/src/hash.rs | 261 +++++++++++++++++- snark/src/merkle_path/mod.rs | 10 +- 19 files changed, 394 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79762e910e..a9e78aca91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4580,6 +4580,7 @@ dependencies = [ "once_cell", "openmina-fuzzer", "openmina-macros", + "poseidon", "redux", "serde", "serde_json", diff --git a/core/Cargo.toml b/core/Cargo.toml index b9b88d7e71..20b2774950 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -29,6 +29,7 @@ thiserror = "1.0.37" mina-hasher = { workspace = true } mina-p2p-messages = { workspace = true } +poseidon = { workspace = true } hex = "0.4.3" ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std" ] } diff --git a/core/src/network.rs b/core/src/network.rs index 6b84f4cbe4..e1332141b6 100644 --- a/core/src/network.rs +++ b/core/src/network.rs @@ -1,4 +1,8 @@ use once_cell::sync::OnceCell; +use poseidon::hash::{ + params::{CODA_SIGNATURE, MAINNET_ZKAPP_BODY, MINA_SIGNATURE_MAINNET, TESTNET_ZKAPP_BODY}, + LazyParam, +}; use crate::constants::ConstraintConstants; @@ -16,8 +20,8 @@ pub enum NetworkId { pub struct NetworkConfig { pub name: &'static str, pub network_id: NetworkId, - pub signature_prefix: &'static str, - pub account_update_hash_param: &'static str, + pub signature_prefix: fn() -> &'static poseidon::hash::LazyParam, + pub account_update_hash_param: fn() -> &'static poseidon::hash::LazyParam, pub constraint_system_digests: &'static [[u8; 16]; 3], pub default_peers: Vec<&'static str>, pub circuits_config: &'static CircuitsConfig, @@ -73,11 +77,17 @@ impl NetworkConfig { } fn mainnet_config() -> Self { + fn get_sig() -> &'static LazyParam { + &MINA_SIGNATURE_MAINNET + } + fn get_update() -> &'static LazyParam { + &MAINNET_ZKAPP_BODY + } Self { name: mainnet::NAME, network_id: mainnet::NETWORK_ID, - signature_prefix: mainnet::SIGNATURE_PREFIX, - account_update_hash_param: mainnet::ACCOUNT_UPDATE_HASH_PARAM, + signature_prefix: get_sig, + account_update_hash_param: get_update, constraint_system_digests: &mainnet::CONSTRAINT_SYSTEM_DIGESTS, default_peers: mainnet::default_peers(), circuits_config: &mainnet::CIRCUITS_CONFIG, @@ -86,11 +96,17 @@ impl NetworkConfig { } fn devnet_config() -> Self { + fn get_sig() -> &'static LazyParam { + &CODA_SIGNATURE + } + fn get_update() -> &'static LazyParam { + &TESTNET_ZKAPP_BODY + } Self { name: devnet::NAME, network_id: devnet::NETWORK_ID, - signature_prefix: devnet::SIGNATURE_PREFIX, - account_update_hash_param: devnet::ACCOUNT_UPDATE_HASH_PARAM, + signature_prefix: get_sig, + account_update_hash_param: get_update, constraint_system_digests: &devnet::CONSTRAINT_SYSTEM_DIGESTS, default_peers: devnet::default_peers(), circuits_config: &devnet::CIRCUITS_CONFIG, diff --git a/ledger/src/account/account.rs b/ledger/src/account/account.rs index a95d905266..dd3e53e6b4 100644 --- a/ledger/src/account/account.rs +++ b/ledger/src/account/account.rs @@ -34,7 +34,14 @@ use crate::{ zkapps::snark::FlaggedOption, AppendToInputs as _, MerklePath, MyCow, ToInputs, }; -use poseidon::hash::{hash_noinputs, hash_with_kimchi, Inputs}; +use poseidon::hash::{ + hash_noinputs, hash_with_kimchi, + params::{ + get_merkle_param_for_height, MINA_ACCOUNT, MINA_DERIVE_TOKEN_ID, MINA_SIDELOADED_VK, + MINA_ZKAPP_ACCOUNT, MINA_ZKAPP_URI, NO_INPUT_ZKAPP_ACTION_STATE_EMPTY_ELT, + }, + Inputs, +}; use super::common::*; @@ -550,7 +557,7 @@ impl VerificationKey { } pub fn hash(&self) -> Fp { - self.hash_with_param(Self::HASH_PARAM) + self.hash_with_param(&MINA_SIDELOADED_VK) } pub fn gen() -> Self { @@ -629,7 +636,7 @@ impl ZkAppUri { } } - hash_with_kimchi("MinaZkappUri", &inputs.to_fields()) + hash_with_kimchi(&MINA_ZKAPP_URI, &inputs.to_fields()) } } @@ -883,12 +890,12 @@ impl ZkAppAccount { pub const HASH_PARAM: &'static str = "MinaZkappAccount"; pub fn hash(&self) -> Fp { - self.hash_with_param(Self::HASH_PARAM) + self.hash_with_param(&MINA_ZKAPP_ACCOUNT) } /// empty_state_element pub fn empty_action_state() -> Fp { - cache_one!(Fp, { hash_noinputs("MinaZkappActionStateEmptyElt") }) + hash_noinputs(&NO_INPUT_ZKAPP_ACTION_STATE_EMPTY_ELT) } pub fn is_default(&self) -> bool { @@ -1050,7 +1057,7 @@ impl AccountId { }; TokenId(hash_with_kimchi( - Self::DERIVE_TOKEN_ID_HASH_PARAM, + &MINA_DERIVE_TOKEN_ID, &[self.public_key.x, self.token_id.0, is_odd_field], )) } @@ -1516,7 +1523,7 @@ impl Account { pub fn hash(&self) -> Fp { let inputs = self.to_inputs_owned(); - hash_with_kimchi("MinaAccount", &inputs.to_fields()) + hash_with_kimchi(&MINA_ACCOUNT, &inputs.to_fields()) } pub fn checked_hash(&self, w: &mut Witness) -> Fp { @@ -1699,7 +1706,6 @@ impl ToInputs for Account { fn verify_merkle_path(account: &Account, merkle_path: &[MerklePath]) -> Fp { let account_hash = account.hash(); - let mut param = String::with_capacity(16); merkle_path .iter() @@ -1709,11 +1715,8 @@ fn verify_merkle_path(account: &Account, merkle_path: &[MerklePath]) -> Fp { MerklePath::Left(right) => [accum, *right], MerklePath::Right(left) => [*left, accum], }; - - param.clear(); - write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); - - hash_with_kimchi(param.as_str(), &hashes) + let param = get_merkle_param_for_height(depth); + hash_with_kimchi(param, &hashes) }) } diff --git a/ledger/src/hash.rs b/ledger/src/hash.rs index fe22e5cc91..9dbfb1ce04 100644 --- a/ledger/src/hash.rs +++ b/ledger/src/hash.rs @@ -2,7 +2,7 @@ use mina_hasher::Fp; use mina_signer::CompressedPubKey; use crate::{proofs::witness::Witness, scan_state::currency}; -use poseidon::hash::{hash_with_kimchi, Inputs}; +use poseidon::hash::{hash_with_kimchi, Inputs, LazyParam}; pub trait ToInputs { fn to_inputs(&self, inputs: &mut Inputs); @@ -13,7 +13,7 @@ pub trait ToInputs { inputs } - fn hash_with_param(&self, param: &str) -> Fp { + fn hash_with_param(&self, param: &LazyParam) -> Fp { let mut inputs = Inputs::new(); self.to_inputs(&mut inputs); hash_with_kimchi(param, &inputs.to_fields()) diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index 7863335739..18c8f6a4b3 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -2582,8 +2582,8 @@ pub mod transaction_snark { inputs.append_field(*px); inputs.append_field(*py); inputs.append_field(*rx); - let signature_prefix = openmina_core::NetworkConfig::global().signature_prefix; - let hash = checked_legacy_hash(signature_prefix, inputs, w); + let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); + let hash = checked_legacy_hash(signature_prefix.string, inputs, w); w.exists(field_to_bits::<_, 255>(hash)) } @@ -2644,8 +2644,8 @@ pub mod transaction_snark { inputs.append_field(*px); inputs.append_field(*py); inputs.append_field(*rx); - let signature_prefix = openmina_core::NetworkConfig::global().signature_prefix; - let hash = checked_hash(signature_prefix, &inputs.to_fields(), w); + let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); + let hash = checked_hash(signature_prefix.string, &inputs.to_fields(), w); w.exists(field_to_bits::<_, 255>(hash)) } diff --git a/ledger/src/proofs/zkapp.rs b/ledger/src/proofs/zkapp.rs index c0ad492bfd..fb0ae69904 100644 --- a/ledger/src/proofs/zkapp.rs +++ b/ledger/src/proofs/zkapp.rs @@ -5,7 +5,7 @@ use kimchi::proof::PointEvaluations; use mina_curves::pasta::Fq; use mina_hasher::Fp; use mina_p2p_messages::v2; -use poseidon::hash::hash_with_kimchi; +use poseidon::hash::{hash_with_kimchi, params::MINA_ACCOUNT_UPDATE_CONS}; use crate::{ proofs::{ @@ -37,10 +37,7 @@ use crate::{ LocalState, LocalStateEnv, LocalStateSkeleton, StackFrame, StackFrameChecked, }, protocol_state::{protocol_state_body_view, GlobalStateSkeleton}, - zkapp_command::{ - AccountUpdate, CallForest, Control, WithHash, ZkAppCommand, - ACCOUNT_UPDATE_CONS_HASH_PARAM, - }, + zkapp_command::{AccountUpdate, CallForest, Control, WithHash, ZkAppCommand}, zkapp_statement::{TransactionCommitment, ZkappStatement}, TransactionFailure, }, @@ -407,7 +404,7 @@ fn accumulate_call_stack_hashes( 0, WithStackHash { elt: f.clone(), - stack_hash: hash_with_kimchi(ACCOUNT_UPDATE_CONS_HASH_PARAM, &[h_f, h_tl]), + stack_hash: hash_with_kimchi(&MINA_ACCOUNT_UPDATE_CONS, &[h_f, h_tl]), }, ); diff --git a/ledger/src/scan_state/pending_coinbase.rs b/ledger/src/scan_state/pending_coinbase.rs index 3c2e516817..aa85ec20e9 100644 --- a/ledger/src/scan_state/pending_coinbase.rs +++ b/ledger/src/scan_state/pending_coinbase.rs @@ -24,7 +24,13 @@ use ark_ff::{fields::arithmetic::InvalidBigInt, Zero}; use mina_hasher::Fp; use mina_signer::CompressedPubKey; use openmina_core::constants::constraint_constants; -use poseidon::hash::{hash_noinputs, hash_with_kimchi, Inputs}; +use poseidon::hash::{ + hash_noinputs, hash_with_kimchi, + params::{ + get_coinbase_param_for_height, COINBASE_STACK, MINA_PROTO_STATE, NO_INPUT_COINBASE_STACK, + }, + Inputs, +}; use sha2::{Digest, Sha256}; use crate::{ @@ -149,7 +155,7 @@ impl CoinbaseStack { inputs.append(&CoinbaseData::of_coinbase(cb)); inputs.append_field(self.0); - let hash = hash_with_kimchi("CoinbaseStack", &inputs.to_fields()); + let hash = hash_with_kimchi(&COINBASE_STACK, &inputs.to_fields()); Self(hash) } @@ -173,7 +179,7 @@ impl CoinbaseStack { /// https://github.com/MinaProtocol/mina/blob/2ee6e004ba8c6a0541056076aab22ea162f7eb3a/src/lib/mina_base/pending_coinbase.ml#L188 pub fn empty() -> Self { - Self(hash_noinputs("CoinbaseStack")) + Self(hash_noinputs(&NO_INPUT_COINBASE_STACK)) } /// Used for tests/debug only @@ -220,7 +226,7 @@ impl StateStack { inputs.append_field(state_body_hash); inputs.append_field(global_slot.to_field()); - let hash = hash_with_kimchi("MinaProtoState", &inputs.to_fields()); + let hash = hash_with_kimchi(&MINA_PROTO_STATE, &inputs.to_fields()); Self { init: self.init, @@ -474,13 +480,12 @@ impl merkle_tree::TreeHasher for StackHasher { inputs.append_field(value.state.init); inputs.append_field(value.state.curr); - hash_with_kimchi("CoinbaseStack", &inputs.to_fields()) + hash_with_kimchi(&COINBASE_STACK, &inputs.to_fields()) } - fn merge_hash(depth: usize, left: Fp, right: Fp) -> Fp { - let param = format!("MinaCbMklTree{:03}", depth); - - poseidon::hash::hash_with_kimchi(param.as_str(), &[left, right]) + fn merge_hash(height: usize, left: Fp, right: Fp) -> Fp { + let param = get_coinbase_param_for_height(height); + poseidon::hash::hash_with_kimchi(param, &[left, right]) } fn empty_value() -> Stack { diff --git a/ledger/src/scan_state/protocol_state.rs b/ledger/src/scan_state/protocol_state.rs index e3e1232a58..4d94c89cf0 100644 --- a/ledger/src/scan_state/protocol_state.rs +++ b/ledger/src/scan_state/protocol_state.rs @@ -1,7 +1,11 @@ use mina_hasher::Fp; use crate::{proofs::block::ProtocolState, ToInputs}; -use poseidon::hash::{hash_with_kimchi, Inputs}; +use poseidon::hash::{ + hash_with_kimchi, + params::{MINA_PROTO_STATE, MINA_PROTO_STATE_BODY}, + Inputs, +}; pub trait MinaHash { fn hash(&self) -> Fp; @@ -9,7 +13,7 @@ pub trait MinaHash { impl MinaHash for crate::proofs::block::ProtocolStateBody { fn hash(&self) -> Fp { - self.hash_with_param("MinaProtoStateBody") + self.hash_with_param(&MINA_PROTO_STATE_BODY) } } @@ -19,7 +23,7 @@ pub fn hashes_abstract(previous_state_hash: Fp, body_hash: Fp) -> Fp { inputs.append_field(previous_state_hash); inputs.append_field(body_hash); - hash_with_kimchi("MinaProtoState", &inputs.to_fields()) + hash_with_kimchi(&MINA_PROTO_STATE, &inputs.to_fields()) } impl ProtocolState { diff --git a/ledger/src/scan_state/transaction_logic.rs b/ledger/src/scan_state/transaction_logic.rs index 68c2e7e51b..ace1be8a7f 100644 --- a/ledger/src/scan_state/transaction_logic.rs +++ b/ledger/src/scan_state/transaction_logic.rs @@ -10,6 +10,7 @@ use mina_p2p_messages::v2::{MinaBaseUserCommandStableV2, MinaTransactionTransact use mina_signer::CompressedPubKey; use openmina_core::constants::ConstraintConstants; use openmina_macros::SerdeYojsonEnum; +use poseidon::hash::params::{CODA_RECEIPT_UC, MINA_ZKAPP_MEMO}; use poseidon::hash::{hash_noinputs, hash_with_kimchi, Inputs}; use crate::proofs::witness::Witness; @@ -625,7 +626,7 @@ impl Memo { // For some reason we are mixing legacy inputs and "new" hashing let mut inputs = legacy::Inputs::new(); inputs.append_bytes(&self.0); - hash_with_kimchi("MinaZkappMemo", &inputs.to_fields()) + hash_with_kimchi(&MINA_ZKAPP_MEMO, &inputs.to_fields()) } pub fn as_slice(&self) -> &[u8] { @@ -904,6 +905,10 @@ pub mod zkapp_command { use ark_ff::UniformRand; use mina_p2p_messages::v2::MinaBaseZkappCommandTStableV1WireStableV1AccountUpdatesA; use mina_signer::Signature; + use poseidon::hash::params::{ + MINA_ACCOUNT_UPDATE_CONS, MINA_ACCOUNT_UPDATE_NODE, MINA_ZKAPP_EVENT, MINA_ZKAPP_EVENTS, + MINA_ZKAPP_SEQ_EVENTS, NO_INPUT_MINA_ZKAPP_ACTIONS_EMPTY, NO_INPUT_MINA_ZKAPP_EVENTS_EMPTY, + }; use rand::{seq::SliceRandom, Rng}; use crate::{ @@ -932,7 +937,7 @@ pub mod zkapp_command { Self(Vec::new()) } pub fn hash(&self) -> Fp { - hash_with_kimchi("MinaZkappEvent", &self.0[..]) + hash_with_kimchi(&MINA_ZKAPP_EVENT, &self.0[..]) } pub fn len(&self) -> usize { let Self(list) = self; @@ -962,12 +967,16 @@ pub mod zkapp_command { .collect() } + use poseidon::hash::LazyParam; + /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/zkapp_account.ml#L23 pub trait MakeEvents { const SALT_PHRASE: &'static str; const HASH_PREFIX: &'static str; const DERIVER_NAME: (); // Unused here for now + fn get_salt_phrase() -> &'static LazyParam; + fn get_hash_prefix() -> &'static LazyParam; fn events(&self) -> &[Event]; fn empty_hash() -> Fp; } @@ -977,6 +986,12 @@ pub mod zkapp_command { const SALT_PHRASE: &'static str = "MinaZkappEventsEmpty"; const HASH_PREFIX: &'static str = "MinaZkappEvents"; const DERIVER_NAME: () = (); + fn get_salt_phrase() -> &'static LazyParam { + &NO_INPUT_MINA_ZKAPP_EVENTS_EMPTY + } + fn get_hash_prefix() -> &'static poseidon::hash::LazyParam { + &MINA_ZKAPP_EVENTS + } fn events(&self) -> &[Event] { self.0.as_slice() } @@ -990,6 +1005,12 @@ pub mod zkapp_command { const SALT_PHRASE: &'static str = "MinaZkappActionsEmpty"; const HASH_PREFIX: &'static str = "MinaZkappSeqEvents"; const DERIVER_NAME: () = (); + fn get_salt_phrase() -> &'static LazyParam { + &NO_INPUT_MINA_ZKAPP_ACTIONS_EMPTY + } + fn get_hash_prefix() -> &'static poseidon::hash::LazyParam { + &MINA_ZKAPP_SEQ_EVENTS + } fn events(&self) -> &[Event] { self.0.as_slice() } @@ -1003,10 +1024,10 @@ pub mod zkapp_command { where E: MakeEvents, { - let init = hash_noinputs(E::SALT_PHRASE); + let init = hash_noinputs(E::get_salt_phrase()); e.events().iter().rfold(init, |accum, elem| { - hash_with_kimchi(E::HASH_PREFIX, &[accum, elem.hash()]) + hash_with_kimchi(E::get_hash_prefix(), &[accum, elem.hash()]) }) } @@ -1164,17 +1185,17 @@ pub mod zkapp_command { } pub fn push_event(acc: Fp, event: Event) -> Fp { - hash_with_kimchi(Self::HASH_PREFIX, &[acc, event.hash()]) + hash_with_kimchi(Self::get_hash_prefix(), &[acc, event.hash()]) } pub fn push_events(&self, acc: Fp) -> Fp { let hash = self .0 .iter() - .rfold(hash_noinputs(Self::SALT_PHRASE), |acc, e| { + .rfold(hash_noinputs(Self::get_salt_phrase()), |acc, e| { Self::push_event(acc, e.clone()) }); - hash_with_kimchi(Self::HASH_PREFIX, &[acc, hash]) + hash_with_kimchi(Self::get_hash_prefix(), &[acc, hash]) } } @@ -1188,17 +1209,17 @@ pub mod zkapp_command { } pub fn push_event(acc: Fp, event: Event) -> Fp { - hash_with_kimchi(Self::HASH_PREFIX, &[acc, event.hash()]) + hash_with_kimchi(Self::get_hash_prefix(), &[acc, event.hash()]) } pub fn push_events(&self, acc: Fp) -> Fp { let hash = self .0 .iter() - .rfold(hash_noinputs(Self::SALT_PHRASE), |acc, e| { + .rfold(hash_noinputs(Self::get_salt_phrase()), |acc, e| { Self::push_event(acc, e.clone()) }); - hash_with_kimchi(Self::HASH_PREFIX, &[acc, hash]) + hash_with_kimchi(Self::get_hash_prefix(), &[acc, hash]) } } @@ -2816,7 +2837,9 @@ pub mod zkapp_command { /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/account_update.ml#L1327 pub fn digest(&self) -> Fp { - self.hash_with_param(openmina_core::NetworkConfig::global().account_update_hash_param) + self.hash_with_param( + (openmina_core::NetworkConfig::global().account_update_hash_param)() + ) } pub fn timing(&self) -> SetOrKeep { @@ -3126,7 +3149,10 @@ pub mod zkapp_command { None => Fp::zero(), }; let account_update_digest = self.account_update_digest.get().unwrap(); - hash_with_kimchi(Self::HASH_PARAM, &[account_update_digest, stack_hash]) + hash_with_kimchi( + &MINA_ACCOUNT_UPDATE_NODE, + &[account_update_digest, stack_hash], + ) } fn fold(&self, init: Vec, f: &mut F) -> Vec @@ -3239,7 +3265,7 @@ pub mod zkapp_command { let hash = tree.digest(); let h_tl = self.hash(); - let stack_hash = hash_with_kimchi(ACCOUNT_UPDATE_CONS_HASH_PARAM, &[hash, h_tl]); + let stack_hash = hash_with_kimchi(&MINA_ACCOUNT_UPDATE_CONS, &[hash, h_tl]); let node = WithStackHash:: { elt: tree, stack_hash: MutableFp::new(stack_hash), @@ -3439,7 +3465,7 @@ pub mod zkapp_command { pub fn accumulate_hashes(&self) { /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/zkapp_command.ml#L293 fn cons(hash: Fp, h_tl: Fp) -> Fp { - hash_with_kimchi(ACCOUNT_UPDATE_CONS_HASH_PARAM, &[hash, h_tl]) + hash_with_kimchi(&MINA_ACCOUNT_UPDATE_CONS, &[hash, h_tl]) } /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/zkapp_command.ml#L561 @@ -4172,8 +4198,10 @@ pub mod zkapp_command { } pub mod zkapp_statement { + use poseidon::hash::params::MINA_ACCOUNT_UPDATE_CONS; + use super::{ - zkapp_command::{CallForest, Tree, ACCOUNT_UPDATE_CONS_HASH_PARAM}, + zkapp_command::{CallForest, Tree}, *, }; @@ -4189,7 +4217,7 @@ pub mod zkapp_statement { /// https://github.com/MinaProtocol/mina/blob/3753a8593cc1577bcf4da16620daf9946d88e8e5/src/lib/mina_base/zkapp_command.ml#L1368 pub fn create_complete(&self, memo_hash: Fp, fee_payer_hash: Fp) -> Self { Self(hash_with_kimchi( - ACCOUNT_UPDATE_CONS_HASH_PARAM, + &MINA_ACCOUNT_UPDATE_CONS, &[memo_hash, fee_payer_hash, self.0], )) } @@ -5078,6 +5106,8 @@ pub mod protocol_state { pub mod local_state { use std::{cell::RefCell, rc::Rc}; + use poseidon::hash::params::MINA_ACCOUNT_UPDATE_STACK_FRAME; + use crate::{ proofs::{ field::{field, Boolean, ToBoolean}, @@ -5284,7 +5314,7 @@ pub mod local_state { }; inputs.append_field(field); - hash_with_kimchi("MinaAcctUpdStckFrm", &inputs.to_fields()) + hash_with_kimchi(&MINA_ACCOUNT_UPDATE_STACK_FRAME, &inputs.to_fields()) } pub fn digest(&self) -> Fp { @@ -7506,7 +7536,7 @@ pub fn cons_signed_command_payload( let mut inputs = union.to_input_legacy(); inputs.append_field(last_receipt_chain_hash); - let hash = legacy::hash_with_kimchi(ReceiptChainHash::HASH_PREFIX, &inputs.to_fields()); + let hash = legacy::hash_with_kimchi(&legacy::params::CODA_RECEIPT_UC, &inputs.to_fields()); ReceiptChainHash(hash) } @@ -7544,10 +7574,7 @@ pub fn cons_zkapp_command_commitment( inputs.append_field(x.0); inputs.append(receipt_hash); - ReceiptChainHash(hash_with_kimchi( - ReceiptChainHash::HASH_PREFIX, - &inputs.to_fields(), - )) + ReceiptChainHash(hash_with_kimchi(&CODA_RECEIPT_UC, &inputs.to_fields())) } fn validate_nonces(txn_nonce: Nonce, account_nonce: Nonce) -> Result<(), String> { diff --git a/ledger/src/sparse_ledger/sparse_ledger_impl.rs b/ledger/src/sparse_ledger/sparse_ledger_impl.rs index ede79c47f0..6c6443823c 100644 --- a/ledger/src/sparse_ledger/sparse_ledger_impl.rs +++ b/ledger/src/sparse_ledger/sparse_ledger_impl.rs @@ -1,11 +1,9 @@ -use std::{ - collections::{BTreeMap, HashMap, VecDeque}, - fmt::Write, -}; +use std::collections::{BTreeMap, HashMap, VecDeque}; use ark_ff::Zero; use mina_hasher::Fp; use mina_signer::CompressedPubKey; +use poseidon::hash::params::get_merkle_param_for_height; use crate::{ scan_state::{currency::Slot, transaction_logic::AccountState}, @@ -156,7 +154,6 @@ impl SparseLedgerImpl { let account_addr = addr.clone(); let mut current = account.hash(); - let mut param = String::with_capacity(16); // Go back from the account to root, to compute missing hashes for (depth, path) in merkle_path.iter().enumerate() { @@ -167,10 +164,8 @@ impl SparseLedgerImpl { MerklePath::Right(left) => [*left, current], }; - param.clear(); - write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); - - current = poseidon::hash::hash_with_kimchi(param.as_str(), &hashes); + let param = get_merkle_param_for_height(depth); + current = poseidon::hash::hash_with_kimchi(param, &hashes); addr = addr.parent().unwrap(); } diff --git a/ledger/src/tree_version.rs b/ledger/src/tree_version.rs index 2685cd1b2f..69913c1b64 100644 --- a/ledger/src/tree_version.rs +++ b/ledger/src/tree_version.rs @@ -1,6 +1,7 @@ use std::{fmt::Debug, hash::Hash}; use mina_hasher::Fp; +use poseidon::hash::params::get_merkle_param_for_height; use crate::account::{get_legacy_hash_of, Account, AccountLegacy, TokenId, TokenIdLegacy}; @@ -24,9 +25,8 @@ impl TreeVersion for V2 { type TokenId = TokenId; fn hash_node(height: usize, left: Fp, right: Fp) -> Fp { - let param = format!("MinaMklTree{height:03}"); - - poseidon::hash::hash_with_kimchi(param.as_str(), &[left, right]) + let param = get_merkle_param_for_height(height); + poseidon::hash::hash_with_kimchi(param, &[left, right]) } fn hash_leaf(leaf: &Self::Account) -> Fp { diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs index 5b6179398d..d29e5ead0a 100644 --- a/ledger/src/verifier/mod.rs +++ b/ledger/src/verifier/mod.rs @@ -388,7 +388,7 @@ pub mod common { let Pallas { x, y, .. } = pubkey.point(); let Signature { rx, s } = signature; - let signature_prefix = openmina_core::NetworkConfig::global().signature_prefix; + let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); let hash = hash_with_kimchi(signature_prefix, &[**msg, *x, *y, *rx]); let hash: Fq = Fq::try_from(hash.into_repr()).unwrap(); // Never fail, `Fq` is larger than `Fp` @@ -419,7 +419,7 @@ pub mod common { let Pallas { x, y, .. } = pubkey.point(); let Signature { rx, s } = signature; - let signature_prefix = openmina_core::NetworkConfig::global().signature_prefix; + let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); let mut inputs = msg.to_input_legacy(); inputs.append_field(*x); diff --git a/ledger/src/zkapps/snark.rs b/ledger/src/zkapps/snark.rs index 2d54935f59..0e5cb4cf25 100644 --- a/ledger/src/zkapps/snark.rs +++ b/ledger/src/zkapps/snark.rs @@ -280,8 +280,8 @@ impl CallForestInterface for SnarkCallForest { let account_update = w.exists(&account_update.body); let account_update = { let account_update_hash_param = - openmina_core::NetworkConfig::global().account_update_hash_param; - let hash = account_update.checked_hash_with_param(account_update_hash_param, w); + (openmina_core::NetworkConfig::global().account_update_hash_param)(); + let hash = account_update.checked_hash_with_param(account_update_hash_param.string, w); WithHash { data: account_update.clone(), hash, diff --git a/mina-p2p-messages/src/v2/hashing.rs b/mina-p2p-messages/src/v2/hashing.rs index a1c02823ff..d46f19758a 100644 --- a/mina-p2p-messages/src/v2/hashing.rs +++ b/mina-p2p-messages/src/v2/hashing.rs @@ -5,7 +5,11 @@ use binprot::BinProtWrite; use binprot_derive::{BinProtRead, BinProtWrite}; use generated::MinaStateBlockchainStateValueStableV2; use mina_hasher::Fp; -use poseidon::hash::{hash_with_kimchi, Inputs}; +use poseidon::hash::{ + hash_with_kimchi, + params::{MINA_PROTO_STATE, MINA_PROTO_STATE_BODY}, + Inputs, +}; use serde::{Deserialize, Serialize}; use sha2::{ digest::{generic_array::GenericArray, typenum::U32}, @@ -362,7 +366,7 @@ fn fp_state_hash_from_fp_hashes(previous_state_hash: Fp, body_hash: Fp) -> Fp { let mut inputs = Inputs::new(); inputs.append_field(previous_state_hash); inputs.append_field(body_hash); - hash_with_kimchi("MinaProtoState", &inputs.to_fields()) + hash_with_kimchi(&MINA_PROTO_STATE, &inputs.to_fields()) } impl StateHash { @@ -430,7 +434,10 @@ impl MinaHash for MinaStateProtocolStateBodyValueStableV2 { fn try_hash(&self) -> Result { let mut inputs = Inputs::new(); self.to_input(&mut inputs)?; - Ok(hash_with_kimchi("MinaProtoStateBody", &inputs.to_fields())) + Ok(hash_with_kimchi( + &MINA_PROTO_STATE_BODY, + &inputs.to_fields(), + )) } } diff --git a/mina-p2p-messages/src/v2/manual.rs b/mina-p2p-messages/src/v2/manual.rs index e138b4853d..cd12a08a20 100644 --- a/mina-p2p-messages/src/v2/manual.rs +++ b/mina-p2p-messages/src/v2/manual.rs @@ -4,6 +4,7 @@ use ark_ff::BigInteger256; use binprot::{BinProtRead, BinProtWrite}; use binprot_derive::{BinProtRead, BinProtWrite}; use derive_more::Deref; +use poseidon::hash::params::NO_INPUT_COINBASE_STACK; use serde::{de::Visitor, ser::SerializeTuple, Deserialize, Serialize, Serializer}; use time::OffsetDateTime; @@ -544,7 +545,7 @@ impl CoinbaseStackData { pub fn empty() -> Self { // In OCaml: https://github.com/MinaProtocol/mina/blob/68b49fdaafabed0f2cd400c4c69f91e81db681e7/src/lib/mina_base/pending_coinbase.ml#L186 // let empty = Random_oracle.salt "CoinbaseStack" |> Random_oracle.digest - let empty = poseidon::hash::hash_noinputs("CoinbaseStack"); + let empty = poseidon::hash::hash_noinputs(&NO_INPUT_COINBASE_STACK); MinaBasePendingCoinbaseCoinbaseStackStableV1(empty.into()).into() } } diff --git a/node/src/block_producer/mod.rs b/node/src/block_producer/mod.rs index 5a4850a514..6715c95408 100644 --- a/node/src/block_producer/mod.rs +++ b/node/src/block_producer/mod.rs @@ -17,6 +17,7 @@ mod block_producer_reducer; use ledger::AccountIndex; use mina_p2p_messages::{list::List, v2}; use openmina_core::block::ArcBlockWithHash; +use poseidon::hash::params::MINA_EPOCH_SEED; use serde::{Deserialize, Serialize}; use vrf::output::VrfOutput; @@ -213,6 +214,6 @@ pub fn calc_epoch_seed( ) -> v2::EpochSeed { // TODO(adonagy): fix this unwrap let old_seed = prev_epoch_seed.to_field().unwrap(); - let new_seed = poseidon::hash::hash_with_kimchi("MinaEpochSeed", &[old_seed, vrf_hash]); + let new_seed = poseidon::hash::hash_with_kimchi(&MINA_EPOCH_SEED, &[old_seed, vrf_hash]); v2::MinaBaseEpochSeedStableV1(new_seed.into()).into() } diff --git a/poseidon/src/hash.rs b/poseidon/src/hash.rs index c5bacf331c..229b9f5523 100644 --- a/poseidon/src/hash.rs +++ b/poseidon/src/hash.rs @@ -1,7 +1,7 @@ use ark_ff::{BigInteger as _, BigInteger256, Field, FromBytes as _}; use mina_curves::pasta::Fp; -use crate::{Sponge, SpongeParamsForField}; +use crate::{PlonkSpongeConstantsKimchi, Sponge, SpongeParamsForField}; enum Item { Bool(bool), @@ -198,11 +198,18 @@ fn param_to_field_noinputs(param: &str) -> Fp { param_to_field_impl(param, DEFAULT) } -pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = Sponge::::default(); +pub fn hash_with_kimchi(param: &LazyParam, fields: &[Fp]) -> Fp { + let LazyParam { + sponge_state, + state, + .. + } = param; - sponge.absorb(&[param_to_field(param)]); - sponge.squeeze(); + let mut sponge = Sponge { + sponge_state: sponge_state.clone(), + state: *state, + ..Sponge::::default() + }; sponge.absorb(fields); sponge.squeeze() @@ -215,12 +222,198 @@ pub fn hash_fields>(fields: &[F]) -> F { sponge.squeeze() } -pub fn hash_noinputs(param: &str) -> Fp { - let mut sponge = Sponge::::default(); - // ArithmeticSponge::::new(pasta::fp_kimchi::static_params()); +pub fn hash_noinputs(param: &LazyParam) -> Fp { + let LazyParam { last_squeezed, .. } = param; - sponge.absorb(&[param_to_field_noinputs(param)]); - sponge.squeeze() + *last_squeezed +} + +pub struct LazyParam { + sponge_state: crate::SpongeState, + state: [Fp; 3], + last_squeezed: Fp, + pub string: &'static str, +} + +pub mod params { + use once_cell::sync::Lazy; + + use super::*; + + macro_rules! impl_params { + ($({$name:tt, $string:tt}),*) => ($( + pub static $name: Lazy> = Lazy::new(|| { + let mut sponge = Sponge::::default(); + sponge.absorb(&[param_to_field($string)]); + let last_squeezed = sponge.squeeze(); + Box::new(LazyParam { + sponge_state: sponge.sponge_state, + state: sponge.state, + last_squeezed, + string: $string, + }) + }); + )*) + } + + impl_params!( + {MINA_ACCOUNT, "MinaAccount"}, + {MINA_PROTO_STATE, "MinaProtoState"}, + {MINA_PROTO_STATE_BODY, "MinaProtoStateBody"}, + {MINA_DERIVE_TOKEN_ID, "MinaDeriveTokenId"}, + {MINA_EPOCH_SEED, "MinaEpochSeed"}, + {MINA_SIDELOADED_VK, "MinaSideLoadedVk"}, + + {CODA_RECEIPT_UC, "CodaReceiptUC"}, + {COINBASE_STACK, "CoinbaseStack"}, + + {MINA_ACCOUNT_UPDATE_CONS, "MinaAcctUpdateCons"}, + {MINA_ACCOUNT_UPDATE_NODE, "MinaAcctUpdateNode"}, + {MINA_ACCOUNT_UPDATE_STACK_FRAME, "MinaAcctUpdStckFrm"}, + + {MINA_ZKAPP_ACCOUNT, "MinaZkappAccount"}, + {MINA_ZKAPP_MEMO, "MinaZkappMemo"}, + {MINA_ZKAPP_URI, "MinaZkappUri"}, + {MINA_ZKAPP_EVENT, "MinaZkappEvent"}, + {MINA_ZKAPP_EVENTS, "MinaZkappEvents"}, + {MINA_ZKAPP_SEQ_EVENTS, "MinaZkappSeqEvents"}, + + // devnet + {CODA_SIGNATURE, "CodaSignature"}, + {TESTNET_ZKAPP_BODY, "TestnetZkappBody"}, + // mainnet + {MINA_SIGNATURE_MAINNET, "MinaSignatureMainnet"}, + {MAINNET_ZKAPP_BODY, "MainnetZkappBody"}, + + {MINA_MERKLE_TREE_0, "MinaMklTree000"}, + {MINA_MERKLE_TREE_1, "MinaMklTree001"}, + {MINA_MERKLE_TREE_2, "MinaMklTree002"}, + {MINA_MERKLE_TREE_3, "MinaMklTree003"}, + {MINA_MERKLE_TREE_4, "MinaMklTree004"}, + {MINA_MERKLE_TREE_5, "MinaMklTree005"}, + {MINA_MERKLE_TREE_6, "MinaMklTree006"}, + {MINA_MERKLE_TREE_7, "MinaMklTree007"}, + {MINA_MERKLE_TREE_8, "MinaMklTree008"}, + {MINA_MERKLE_TREE_9, "MinaMklTree009"}, + {MINA_MERKLE_TREE_10, "MinaMklTree010"}, + {MINA_MERKLE_TREE_11, "MinaMklTree011"}, + {MINA_MERKLE_TREE_12, "MinaMklTree012"}, + {MINA_MERKLE_TREE_13, "MinaMklTree013"}, + {MINA_MERKLE_TREE_14, "MinaMklTree014"}, + {MINA_MERKLE_TREE_15, "MinaMklTree015"}, + {MINA_MERKLE_TREE_16, "MinaMklTree016"}, + {MINA_MERKLE_TREE_17, "MinaMklTree017"}, + {MINA_MERKLE_TREE_18, "MinaMklTree018"}, + {MINA_MERKLE_TREE_19, "MinaMklTree019"}, + {MINA_MERKLE_TREE_20, "MinaMklTree020"}, + {MINA_MERKLE_TREE_21, "MinaMklTree021"}, + {MINA_MERKLE_TREE_22, "MinaMklTree022"}, + {MINA_MERKLE_TREE_23, "MinaMklTree023"}, + {MINA_MERKLE_TREE_24, "MinaMklTree024"}, + {MINA_MERKLE_TREE_25, "MinaMklTree025"}, + {MINA_MERKLE_TREE_26, "MinaMklTree026"}, + {MINA_MERKLE_TREE_27, "MinaMklTree027"}, + {MINA_MERKLE_TREE_28, "MinaMklTree028"}, + {MINA_MERKLE_TREE_29, "MinaMklTree029"}, + {MINA_MERKLE_TREE_30, "MinaMklTree030"}, + {MINA_MERKLE_TREE_31, "MinaMklTree031"}, + {MINA_MERKLE_TREE_32, "MinaMklTree032"}, + {MINA_MERKLE_TREE_33, "MinaMklTree033"}, + {MINA_MERKLE_TREE_34, "MinaMklTree034"}, + {MINA_MERKLE_TREE_35, "MinaMklTree035"}, + + {MINA_CB_MERKLE_TREE_0, "MinaCbMklTree000"}, + {MINA_CB_MERKLE_TREE_1, "MinaCbMklTree001"}, + {MINA_CB_MERKLE_TREE_2, "MinaCbMklTree002"}, + {MINA_CB_MERKLE_TREE_3, "MinaCbMklTree003"}, + {MINA_CB_MERKLE_TREE_4, "MinaCbMklTree004"}, + {MINA_CB_MERKLE_TREE_5, "MinaCbMklTree005"} + ); + + pub fn get_coinbase_param_for_height(height: usize) -> &'static LazyParam { + static ARRAY: [&Lazy>; 6] = [ + &MINA_CB_MERKLE_TREE_0, + &MINA_CB_MERKLE_TREE_1, + &MINA_CB_MERKLE_TREE_2, + &MINA_CB_MERKLE_TREE_3, + &MINA_CB_MERKLE_TREE_4, + &MINA_CB_MERKLE_TREE_5, + ]; + + ARRAY[height] + } + + pub fn get_merkle_param_for_height(height: usize) -> &'static LazyParam { + static ARRAY: [&Lazy>; 36] = [ + &MINA_MERKLE_TREE_0, + &MINA_MERKLE_TREE_1, + &MINA_MERKLE_TREE_2, + &MINA_MERKLE_TREE_3, + &MINA_MERKLE_TREE_4, + &MINA_MERKLE_TREE_5, + &MINA_MERKLE_TREE_6, + &MINA_MERKLE_TREE_7, + &MINA_MERKLE_TREE_8, + &MINA_MERKLE_TREE_9, + &MINA_MERKLE_TREE_10, + &MINA_MERKLE_TREE_11, + &MINA_MERKLE_TREE_12, + &MINA_MERKLE_TREE_13, + &MINA_MERKLE_TREE_14, + &MINA_MERKLE_TREE_15, + &MINA_MERKLE_TREE_16, + &MINA_MERKLE_TREE_17, + &MINA_MERKLE_TREE_18, + &MINA_MERKLE_TREE_19, + &MINA_MERKLE_TREE_20, + &MINA_MERKLE_TREE_21, + &MINA_MERKLE_TREE_22, + &MINA_MERKLE_TREE_23, + &MINA_MERKLE_TREE_24, + &MINA_MERKLE_TREE_25, + &MINA_MERKLE_TREE_26, + &MINA_MERKLE_TREE_27, + &MINA_MERKLE_TREE_28, + &MINA_MERKLE_TREE_29, + &MINA_MERKLE_TREE_30, + &MINA_MERKLE_TREE_31, + &MINA_MERKLE_TREE_32, + &MINA_MERKLE_TREE_33, + &MINA_MERKLE_TREE_34, + &MINA_MERKLE_TREE_35, + ]; + + ARRAY[height] + } + + macro_rules! impl_params_noinput { + ($({$name:tt, $string:tt}),*) => ($( + pub static $name: Lazy> = Lazy::new(|| { + let mut sponge = Sponge::::default(); + sponge.absorb(&[param_to_field_noinputs($string)]); + let last_squeezed = sponge.squeeze(); + Box::new(LazyParam { + sponge_state: sponge.sponge_state, + state: sponge.state, + last_squeezed, + string: $string, + }) + }); + )*) + } + + impl_params_noinput!( + {NO_INPUT_ZKAPP_ACTION_STATE_EMPTY_ELT, "MinaZkappActionStateEmptyElt"}, + {NO_INPUT_COINBASE_STACK, "CoinbaseStack"}, + {NO_INPUT_MINA_ZKAPP_EVENTS_EMPTY, "MinaZkappEventsEmpty"}, + {NO_INPUT_MINA_ZKAPP_ACTIONS_EMPTY, "MinaZkappActionsEmpty"}, + + {NO_INPUT_MINA_PROTO_STATE, "MinaProtoState"}, + {NO_INPUT_MINA_PROTO_STATE_BODY, "MinaProtoStateBody"}, + {NO_INPUT_MINA_DERIVE_TOKEN_ID, "MinaDeriveTokenId"}, + {NO_INPUT_MINA_EPOCH_SEED, "MinaEpochSeed"}, + {NO_INPUT_MINA_SIDELOADED_VK, "MinaSideLoadedVk"} + ); } pub mod legacy { @@ -303,13 +496,53 @@ pub mod legacy { } } - pub fn hash_with_kimchi(param: &str, fields: &[Fp]) -> Fp { - let mut sponge = Sponge::new_legacy(); + pub fn hash_with_kimchi(param: &LazyParam, fields: &[Fp]) -> Fp { + let LazyParam { + sponge_state, + state, + .. + } = param; - sponge.absorb(&[param_to_field(param)]); - sponge.squeeze(); + let mut sponge = Sponge { + sponge_state: sponge_state.clone(), + state: *state, + ..Sponge::new_legacy() + }; sponge.absorb(fields); sponge.squeeze() } + + pub mod params { + use once_cell::sync::Lazy; + + use super::*; + + macro_rules! impl_params { + ($({$name:tt, $string:tt}),*) => ($( + pub static $name: Lazy> = Lazy::new(|| { + let mut sponge = Sponge::new_legacy(); + sponge.absorb(&[param_to_field($string)]); + let last_squeezed = sponge.squeeze(); + Box::new(LazyParam { + sponge_state: sponge.sponge_state, + state: sponge.state, + last_squeezed, + string: $string, + }) + }); + )*) + } + + impl_params!( + {CODA_RECEIPT_UC, "CodaReceiptUC"}, + + // devnet + {CODA_SIGNATURE, "CodaSignature"}, + {TESTNET_ZKAPP_BODY, "TestnetZkappBody"}, + // mainnet + {MINA_SIGNATURE_MAINNET, "MinaSignatureMainnet"}, + {MAINNET_ZKAPP_BODY, "MainnetZkappBody"} + ); + } } diff --git a/snark/src/merkle_path/mod.rs b/snark/src/merkle_path/mod.rs index 37be1bfdc4..df461bd0ed 100644 --- a/snark/src/merkle_path/mod.rs +++ b/snark/src/merkle_path/mod.rs @@ -1,7 +1,6 @@ -use std::fmt::Write; - use ark_ff::fields::arithmetic::InvalidBigInt; use mina_p2p_messages::{bigint::BigInt, v2::MerkleTreeNode}; +use poseidon::hash::params::get_merkle_param_for_height; /// Computes the root hash of the merkle tree with an account and its merkle path /// @@ -13,7 +12,6 @@ pub fn calc_merkle_root_hash( ) -> Result { let account: ledger::Account = account.try_into()?; let mut child_hash = account.hash(); - let mut param = String::with_capacity(16); for (depth, path) in merkle_path.iter().enumerate() { let hashes = match path { @@ -21,10 +19,8 @@ pub fn calc_merkle_root_hash( MerkleTreeNode::Right(left) => [left.to_field()?, child_hash], }; - param.clear(); - write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); - - child_hash = poseidon::hash::hash_with_kimchi(param.as_str(), &hashes) + let param = get_merkle_param_for_height(depth); + child_hash = poseidon::hash::hash_with_kimchi(param, &hashes) } Ok(child_hash.into()) From 1c1af36d24cea023bdd929935d557bbeb4a11924 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Sun, 24 Nov 2024 09:47:48 +0100 Subject: [PATCH 105/175] Fix poseidon prefix when verifying signatures --- core/src/network.rs | 18 ++++++++++++++---- ledger/src/verifier/mod.rs | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/core/src/network.rs b/core/src/network.rs index e1332141b6..1ebf736fab 100644 --- a/core/src/network.rs +++ b/core/src/network.rs @@ -1,5 +1,6 @@ use once_cell::sync::OnceCell; use poseidon::hash::{ + legacy, params::{CODA_SIGNATURE, MAINNET_ZKAPP_BODY, MINA_SIGNATURE_MAINNET, TESTNET_ZKAPP_BODY}, LazyParam, }; @@ -21,6 +22,7 @@ pub struct NetworkConfig { pub name: &'static str, pub network_id: NetworkId, pub signature_prefix: fn() -> &'static poseidon::hash::LazyParam, + pub legacy_signature_prefix: fn() -> &'static poseidon::hash::LazyParam, pub account_update_hash_param: fn() -> &'static poseidon::hash::LazyParam, pub constraint_system_digests: &'static [[u8; 16]; 3], pub default_peers: Vec<&'static str>, @@ -80,14 +82,18 @@ impl NetworkConfig { fn get_sig() -> &'static LazyParam { &MINA_SIGNATURE_MAINNET } - fn get_update() -> &'static LazyParam { + fn get_legacy_sig() -> &'static LazyParam { + &legacy::params::MINA_SIGNATURE_MAINNET + } + fn get_zkapp_body() -> &'static LazyParam { &MAINNET_ZKAPP_BODY } Self { name: mainnet::NAME, network_id: mainnet::NETWORK_ID, signature_prefix: get_sig, - account_update_hash_param: get_update, + legacy_signature_prefix: get_legacy_sig, + account_update_hash_param: get_zkapp_body, constraint_system_digests: &mainnet::CONSTRAINT_SYSTEM_DIGESTS, default_peers: mainnet::default_peers(), circuits_config: &mainnet::CIRCUITS_CONFIG, @@ -99,14 +105,18 @@ impl NetworkConfig { fn get_sig() -> &'static LazyParam { &CODA_SIGNATURE } - fn get_update() -> &'static LazyParam { + fn get_legacy_sig() -> &'static LazyParam { + &legacy::params::CODA_SIGNATURE + } + fn get_zkapp_body() -> &'static LazyParam { &TESTNET_ZKAPP_BODY } Self { name: devnet::NAME, network_id: devnet::NETWORK_ID, signature_prefix: get_sig, - account_update_hash_param: get_update, + legacy_signature_prefix: get_legacy_sig, + account_update_hash_param: get_zkapp_body, constraint_system_digests: &devnet::CONSTRAINT_SYSTEM_DIGESTS, default_peers: devnet::default_peers(), circuits_config: &devnet::CIRCUITS_CONFIG, diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs index d29e5ead0a..5d17dd63e8 100644 --- a/ledger/src/verifier/mod.rs +++ b/ledger/src/verifier/mod.rs @@ -419,7 +419,7 @@ pub mod common { let Pallas { x, y, .. } = pubkey.point(); let Signature { rx, s } = signature; - let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); + let signature_prefix = (openmina_core::NetworkConfig::global().legacy_signature_prefix)(); let mut inputs = msg.to_input_legacy(); inputs.append_field(*x); From 538e84886e48f13604d5d10667982cd65fe72b8a Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Sun, 24 Nov 2024 10:58:23 +0100 Subject: [PATCH 106/175] Use `LazyParam` in witness generation --- core/src/network.rs | 37 +++-------- ledger/src/account/account.rs | 25 +++---- ledger/src/account/common.rs | 2 - ledger/src/hash.rs | 2 +- ledger/src/proofs/block.rs | 21 +++--- ledger/src/proofs/transaction.rs | 65 ++++++------------- ledger/src/proofs/zkapp.rs | 7 +- ledger/src/scan_state/pending_coinbase.rs | 17 ++--- ledger/src/scan_state/transaction_logic.rs | 21 ++---- .../src/sparse_ledger/sparse_ledger_impl.rs | 4 +- ledger/src/verifier/mod.rs | 4 +- ledger/src/zkapps/snark.rs | 55 ++++++++-------- poseidon/src/hash.rs | 13 +++- snark/src/merkle_path/mod.rs | 4 +- 14 files changed, 111 insertions(+), 166 deletions(-) diff --git a/core/src/network.rs b/core/src/network.rs index 1ebf736fab..53d670e0de 100644 --- a/core/src/network.rs +++ b/core/src/network.rs @@ -2,7 +2,6 @@ use once_cell::sync::OnceCell; use poseidon::hash::{ legacy, params::{CODA_SIGNATURE, MAINNET_ZKAPP_BODY, MINA_SIGNATURE_MAINNET, TESTNET_ZKAPP_BODY}, - LazyParam, }; use crate::constants::ConstraintConstants; @@ -21,9 +20,9 @@ pub enum NetworkId { pub struct NetworkConfig { pub name: &'static str, pub network_id: NetworkId, - pub signature_prefix: fn() -> &'static poseidon::hash::LazyParam, - pub legacy_signature_prefix: fn() -> &'static poseidon::hash::LazyParam, - pub account_update_hash_param: fn() -> &'static poseidon::hash::LazyParam, + pub signature_prefix: &'static poseidon::hash::LazyParam, + pub legacy_signature_prefix: &'static poseidon::hash::LazyParam, + pub account_update_hash_param: &'static poseidon::hash::LazyParam, pub constraint_system_digests: &'static [[u8; 16]; 3], pub default_peers: Vec<&'static str>, pub circuits_config: &'static CircuitsConfig, @@ -79,21 +78,12 @@ impl NetworkConfig { } fn mainnet_config() -> Self { - fn get_sig() -> &'static LazyParam { - &MINA_SIGNATURE_MAINNET - } - fn get_legacy_sig() -> &'static LazyParam { - &legacy::params::MINA_SIGNATURE_MAINNET - } - fn get_zkapp_body() -> &'static LazyParam { - &MAINNET_ZKAPP_BODY - } Self { name: mainnet::NAME, network_id: mainnet::NETWORK_ID, - signature_prefix: get_sig, - legacy_signature_prefix: get_legacy_sig, - account_update_hash_param: get_zkapp_body, + signature_prefix: &MINA_SIGNATURE_MAINNET, + legacy_signature_prefix: &legacy::params::MINA_SIGNATURE_MAINNET, + account_update_hash_param: &MAINNET_ZKAPP_BODY, constraint_system_digests: &mainnet::CONSTRAINT_SYSTEM_DIGESTS, default_peers: mainnet::default_peers(), circuits_config: &mainnet::CIRCUITS_CONFIG, @@ -102,21 +92,12 @@ impl NetworkConfig { } fn devnet_config() -> Self { - fn get_sig() -> &'static LazyParam { - &CODA_SIGNATURE - } - fn get_legacy_sig() -> &'static LazyParam { - &legacy::params::CODA_SIGNATURE - } - fn get_zkapp_body() -> &'static LazyParam { - &TESTNET_ZKAPP_BODY - } Self { name: devnet::NAME, network_id: devnet::NETWORK_ID, - signature_prefix: get_sig, - legacy_signature_prefix: get_legacy_sig, - account_update_hash_param: get_zkapp_body, + signature_prefix: &CODA_SIGNATURE, + legacy_signature_prefix: &legacy::params::CODA_SIGNATURE, + account_update_hash_param: &TESTNET_ZKAPP_BODY, constraint_system_digests: &devnet::CONSTRAINT_SYSTEM_DIGESTS, default_peers: devnet::default_peers(), circuits_config: &devnet::CIRCUITS_CONFIG, diff --git a/ledger/src/account/account.rs b/ledger/src/account/account.rs index dd3e53e6b4..0683fbfb71 100644 --- a/ledger/src/account/account.rs +++ b/ledger/src/account/account.rs @@ -1,4 +1,4 @@ -use std::{fmt::Write, io::Cursor, str::FromStr, sync::Arc}; +use std::{io::Cursor, str::FromStr, sync::Arc}; use ark_ff::{BigInteger256, One, UniformRand, Zero}; use mina_hasher::Fp; @@ -518,8 +518,6 @@ impl ToInputs for VerificationKey { } impl VerificationKey { - pub const HASH_PARAM: &'static str = "MinaSideLoadedVk"; - /// https://github.com/MinaProtocol/mina/blob/436023ba41c43a50458a551b7ef7a9ae61670b25/src/lib/pickles/side_loaded_verification_key.ml#L310 pub fn dummy() -> Arc { static VK: OnceCell> = OnceCell::new(); @@ -887,8 +885,6 @@ impl Default for ZkAppAccount { } impl ZkAppAccount { - pub const HASH_PARAM: &'static str = "MinaZkappAccount"; - pub fn hash(&self) -> Fp { self.hash_with_param(&MINA_ZKAPP_ACCOUNT) } @@ -1036,8 +1032,6 @@ impl ToInputs for AccountId { } impl AccountId { - pub const DERIVE_TOKEN_ID_HASH_PARAM: &'static str = "MinaDeriveTokenId"; - pub fn empty() -> Self { Self { public_key: CompressedPubKey::empty(), @@ -1531,7 +1525,7 @@ impl Account { let inputs = self.to_inputs_owned(); - checked_hash("MinaAccount", &inputs.to_fields(), w) + checked_hash(&MINA_ACCOUNT, &inputs.to_fields(), w) } pub fn rand() -> Self { @@ -1710,12 +1704,12 @@ fn verify_merkle_path(account: &Account, merkle_path: &[MerklePath]) -> Fp { merkle_path .iter() .enumerate() - .fold(account_hash, |accum, (depth, path)| { + .fold(account_hash, |accum, (height, path)| { let hashes = match path { MerklePath::Left(right) => [accum, *right], MerklePath::Right(left) => [*left, accum], }; - let param = get_merkle_param_for_height(depth); + let param = get_merkle_param_for_height(height); hash_with_kimchi(param, &hashes) }) } @@ -1729,22 +1723,19 @@ pub fn checked_verify_merkle_path( use crate::proofs::transaction::transaction_snark::checked_hash; let account_hash = account.checked_hash(w); - let mut param = String::with_capacity(16); merkle_path .iter() .enumerate() - .fold(account_hash, |accum, (depth, path)| { + .fold(account_hash, |accum, (height, path)| { let hashes = match path { MerklePath::Left(right) => [accum, *right], MerklePath::Right(left) => [*left, accum], }; - - param.clear(); - write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); - w.exists(hashes); - checked_hash(param.as_str(), &hashes, w) + + let param = get_merkle_param_for_height(height); + checked_hash(param, &hashes, w) }) } diff --git a/ledger/src/account/common.rs b/ledger/src/account/common.rs index a5d18590dc..9cb807d563 100644 --- a/ledger/src/account/common.rs +++ b/ledger/src/account/common.rs @@ -80,8 +80,6 @@ impl ToInputs for ReceiptChainHash { } impl ReceiptChainHash { - pub const HASH_PREFIX: &'static str = "CodaReceiptUC"; - pub fn empty_legacy() -> Self { // Value of `Receipt.Chain_hash.empty` in Ocaml (`compatible` branch) Self::from_hex("0b143c0645497a5987a7b88f66340e03db943f0a0df48b69a3a82921ce97b10a").unwrap() diff --git a/ledger/src/hash.rs b/ledger/src/hash.rs index 9dbfb1ce04..5002828cf7 100644 --- a/ledger/src/hash.rs +++ b/ledger/src/hash.rs @@ -19,7 +19,7 @@ pub trait ToInputs { hash_with_kimchi(param, &inputs.to_fields()) } - fn checked_hash_with_param(&self, param: &str, w: &mut Witness) -> Fp { + fn checked_hash_with_param(&self, param: &LazyParam, w: &mut Witness) -> Fp { use crate::proofs::transaction::transaction_snark::checked_hash; let inputs = self.to_inputs_owned(); diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs index 9a1673bce4..bcc2b3e92b 100644 --- a/ledger/src/proofs/block.rs +++ b/ledger/src/proofs/block.rs @@ -6,7 +6,10 @@ use mina_curves::pasta::Fq; use mina_hasher::Fp; use mina_p2p_messages::v2; use openmina_core::constants::{constraint_constants, ForkConstants}; -use poseidon::hash::Inputs; +use poseidon::hash::{ + params::{MINA_PROTO_STATE, MINA_PROTO_STATE_BODY}, + Inputs, +}; use crate::{ dummy, @@ -221,12 +224,12 @@ fn checked_hash_protocol_state( let mut inputs = Inputs::new(); body.to_inputs(&mut inputs); - let body_hash = checked_hash("MinaProtoStateBody", &inputs.to_fields(), w); + let body_hash = checked_hash(&MINA_PROTO_STATE_BODY, &inputs.to_fields(), w); let mut inputs = Inputs::new(); inputs.append_field(*previous_state_hash); inputs.append_field(body_hash); - let hash = checked_hash("MinaProtoState", &inputs.to_fields(), w); + let hash = checked_hash(&MINA_PROTO_STATE, &inputs.to_fields(), w); Ok((hash, body_hash)) } @@ -243,12 +246,12 @@ fn checked_hash_protocol_state2( let mut inputs = Inputs::new(); body.to_inputs(&mut inputs); - let body_hash = checked_hash("MinaProtoStateBody", &inputs.to_fields(), w); + let body_hash = checked_hash(&MINA_PROTO_STATE_BODY, &inputs.to_fields(), w); let mut inputs = Inputs::new(); inputs.append_field(*previous_state_hash); inputs.append_field(body_hash); - let hash = checked_hash("MinaProtoState", &inputs.to_fields(), w); + let hash = checked_hash(&MINA_PROTO_STATE, &inputs.to_fields(), w); (hash, body_hash) } @@ -608,6 +611,7 @@ mod vrf { use std::ops::Neg; use mina_signer::{CompressedPubKey, PubKey}; + use poseidon::hash::params::{MINA_VRF_MESSAGE, MINA_VRF_OUTPUT}; use crate::{ checked_verify_merkle_path, @@ -651,7 +655,7 @@ mod vrf { fn hash_to_group(m: &Message, w: &mut Witness) -> GroupAffine { let inputs = m.to_inputs_owned().to_fields(); - let hash = checked_hash("MinaVrfMessage", &inputs, w); + let hash = checked_hash(&MINA_VRF_MESSAGE, &inputs, w); crate::proofs::group_map::to_group(hash, w) } @@ -687,7 +691,7 @@ mod vrf { inputs.append_field(x); inputs.append_field(y); - checked_hash("MinaVrfOutput", &inputs.to_fields(), w) + checked_hash(&MINA_VRF_OUTPUT, &inputs.to_fields(), w) } fn eval_and_check_public_key( @@ -816,6 +820,7 @@ mod vrf { pub mod consensus { use ark_ff::Zero; use mina_signer::CompressedPubKey; + use poseidon::hash::params::MINA_EPOCH_SEED; use super::{vrf::VRF_OUTPUT_NBITS, *}; use crate::{ @@ -1397,7 +1402,7 @@ pub mod consensus { }; fn epoch_seed_update_var(seed: Fp, vrf_result: Fp, w: &mut Witness) -> Fp { - checked_hash("MinaEpochSeed", &[seed, vrf_result], w) + checked_hash(&MINA_EPOCH_SEED, &[seed, vrf_result], w) } let next_epoch_data = { diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs index 18c8f6a4b3..848f809997 100644 --- a/ledger/src/proofs/transaction.rs +++ b/ledger/src/proofs/transaction.rs @@ -2239,7 +2239,7 @@ pub mod transaction_snark { zkapps::intefaces::{SignedAmountBranchParam, SignedAmountInterface}, AccountId, PermissionTo, PermsConst, Timing, TimingAsRecordChecked, ToInputs, }; - use ::poseidon::hash::Inputs; + use ::poseidon::hash::{params::MINA_PROTO_STATE_BODY, Inputs, LazyParam}; use ark_ff::Zero; use crate::scan_state::{ @@ -2513,58 +2513,30 @@ pub mod transaction_snark { } } - pub fn checked_legacy_hash(param: &str, inputs: legacy::Inputs, w: &mut Witness) -> Fp { + pub fn checked_legacy_hash( + param: &LazyParam, + inputs: legacy::Inputs, + w: &mut Witness, + ) -> Fp { use ::poseidon::fp_legacy::params; - use ::poseidon::hash::param_to_field; use ::poseidon::PlonkSpongeConstantsLegacy as Constants; - // We hash the parameter first, without introducing values to the witness - let initial_state: [Fp; 3] = { - use ::poseidon::Sponge; - - let mut sponge = Sponge::::new_with_params(params()); - sponge.absorb(&[param_to_field(param)]); - sponge.squeeze(); - sponge.state - }; - + let initial_state: [Fp; 3] = param.state(); let mut sponge = poseidon::Sponge::::new_with_state_params(initial_state, params()); sponge.absorb(&inputs.to_fields(), w); sponge.squeeze(w) } - pub fn checked_hash(param: &str, inputs: &[Fp], w: &mut Witness) -> Fp { - // We hash the parameter first, without introducing values to the witness - let initial_state: [Fp; 3] = { - use ::poseidon::hash::param_to_field; - use ::poseidon::Sponge; - - let mut sponge = Sponge::::default(); - sponge.absorb(&[param_to_field(param)]); - sponge.squeeze(); - sponge.state - }; - - // dbg!(inputs); - + pub fn checked_hash(param: &LazyParam, inputs: &[Fp], w: &mut Witness) -> Fp { + let initial_state: [Fp; 3] = param.state(); let mut sponge = poseidon::Sponge::::new_with_state(initial_state); sponge.absorb(inputs, w); sponge.squeeze(w) } - pub fn checked_hash3(param: &str, inputs: &[Fp], w: &mut Witness) -> Fp { - // We hash the parameter first, without introducing values to the witness - let initial_state: [Fp; 3] = { - use ::poseidon::hash::param_to_field; - use ::poseidon::Sponge; - - let mut sponge = Sponge::::default(); - sponge.absorb(&[param_to_field(param)]); - sponge.squeeze(); - sponge.state - }; - + pub fn checked_hash3(param: &LazyParam, inputs: &[Fp], w: &mut Witness) -> Fp { + let initial_state: [Fp; 3] = param.state(); let mut sponge = poseidon::Sponge::::new_with_state(initial_state); sponge.absorb3(inputs, w); sponge.squeeze(w) @@ -2582,8 +2554,8 @@ pub mod transaction_snark { inputs.append_field(*px); inputs.append_field(*py); inputs.append_field(*rx); - let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); - let hash = checked_legacy_hash(signature_prefix.string, inputs, w); + let signature_prefix = openmina_core::NetworkConfig::global().legacy_signature_prefix; + let hash = checked_legacy_hash(signature_prefix, inputs, w); w.exists(field_to_bits::<_, 255>(hash)) } @@ -2644,8 +2616,8 @@ pub mod transaction_snark { inputs.append_field(*px); inputs.append_field(*py); inputs.append_field(*rx); - let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); - let hash = checked_hash(signature_prefix.string, &inputs.to_fields(), w); + let signature_prefix = openmina_core::NetworkConfig::global().signature_prefix; + let hash = checked_hash(signature_prefix, &inputs.to_fields(), w); w.exists(field_to_bits::<_, 255>(hash)) } @@ -2874,7 +2846,7 @@ pub mod transaction_snark { fee_payer.checked_equal(&source, w); current_global_slot.lte(&payload.common.valid_until.to_checked(), w); - let state_body_hash = state_body.checked_hash_with_param("MinaProtoStateBody", w); + let state_body_hash = state_body.checked_hash_with_param(&MINA_PROTO_STATE_BODY, w); let pending_coinbase_stack_with_state = pending_coinbase_init.checked_push_state(state_body_hash, current_global_slot, w); @@ -4156,6 +4128,7 @@ mod tests_with_wasm { pub(super) mod tests { use std::path::Path; + use ::poseidon::hash::params::MINA_ZKAPP_EVENT; use mina_p2p_messages::binprot::{ self, macros::{BinProtRead, BinProtWrite}, @@ -4482,11 +4455,11 @@ pub(super) mod tests { "6963060754718463299978089777716994949151371320681588566338620419071140958308"; let mut w = Witness::empty(); - let hash = transaction_snark::checked_hash("MinaZkappEvent", &[], &mut w); + let hash = transaction_snark::checked_hash(&MINA_ZKAPP_EVENT, &[], &mut w); assert_eq!(hash, Fp::from_str(EXPECTED).unwrap()); let mut w = Witness::empty(); - let hash = transaction_snark::checked_hash3("MinaZkappEvent", &[], &mut w); + let hash = transaction_snark::checked_hash3(&MINA_ZKAPP_EVENT, &[], &mut w); assert_eq!(hash, Fp::from_str(EXPECTED).unwrap()); } diff --git a/ledger/src/proofs/zkapp.rs b/ledger/src/proofs/zkapp.rs index fb0ae69904..1a87efbc10 100644 --- a/ledger/src/proofs/zkapp.rs +++ b/ledger/src/proofs/zkapp.rs @@ -5,7 +5,10 @@ use kimchi::proof::PointEvaluations; use mina_curves::pasta::Fq; use mina_hasher::Fp; use mina_p2p_messages::v2; -use poseidon::hash::{hash_with_kimchi, params::MINA_ACCOUNT_UPDATE_CONS}; +use poseidon::hash::{ + hash_with_kimchi, + params::{MINA_ACCOUNT_UPDATE_CONS, MINA_PROTO_STATE_BODY}, +}; use crate::{ proofs::{ @@ -958,7 +961,7 @@ fn check_protocol_state(params: CheckProtocolStateParams, w: &mut Witness) { state_body, } = params; - let state_body_hash = state_body.checked_hash_with_param("MinaProtoStateBody", w); + let state_body_hash = state_body.checked_hash_with_param(&MINA_PROTO_STATE_BODY, w); let global_slot = block_global_slot; let computed_pending_coinbase_stack_after = pending_coinbase_stack_init.checked_push_state(state_body_hash, global_slot, w); diff --git a/ledger/src/scan_state/pending_coinbase.rs b/ledger/src/scan_state/pending_coinbase.rs index aa85ec20e9..c77eb89993 100644 --- a/ledger/src/scan_state/pending_coinbase.rs +++ b/ledger/src/scan_state/pending_coinbase.rs @@ -165,7 +165,7 @@ impl CoinbaseStack { inputs.append(&CoinbaseData::of_coinbase(cb)); inputs.append_field(self.0); - let hash = checked_hash("CoinbaseStack", &inputs.to_fields(), w); + let hash = checked_hash(&COINBASE_STACK, &inputs.to_fields(), w); Self(hash) } @@ -246,7 +246,7 @@ impl StateStack { inputs.append_field(state_body_hash); inputs.append_field(global_slot.to_field()); - let hash = checked_hash("MinaProtoState", &inputs.to_fields(), w); + let hash = checked_hash(&MINA_PROTO_STATE, &inputs.to_fields(), w); Self { init: self.init, @@ -457,7 +457,7 @@ impl Stack { } fn hash_var(&self, w: &mut Witness) -> Fp { - checked_hash("CoinbaseStack", &self.to_inputs_owned().to_fields(), w) + checked_hash(&COINBASE_STACK, &self.to_inputs_owned().to_fields(), w) } } @@ -880,22 +880,19 @@ pub fn checked_verify_merkle_path( w: &mut Witness, ) -> Fp { let account_hash = account.hash_var(w); - let mut param = String::with_capacity(16); let hash = merkle_path .iter() .enumerate() - .fold(account_hash, |accum, (depth, path)| { + .fold(account_hash, |accum, (height, path)| { let hashes = match path { MerklePath::Left(right) => [accum, *right], MerklePath::Right(left) => [*left, accum], }; - - param.clear(); - write!(&mut param, "MinaCbMklTree{:03}", depth).unwrap(); - w.exists(hashes); - checked_hash(param.as_str(), &hashes, w) + + let param = get_coinbase_param_for_height(height); + checked_hash(param, &hashes, w) }); hash diff --git a/ledger/src/scan_state/transaction_logic.rs b/ledger/src/scan_state/transaction_logic.rs index ace1be8a7f..c6db87cd30 100644 --- a/ledger/src/scan_state/transaction_logic.rs +++ b/ledger/src/scan_state/transaction_logic.rs @@ -971,8 +971,6 @@ pub mod zkapp_command { /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/zkapp_account.ml#L23 pub trait MakeEvents { - const SALT_PHRASE: &'static str; - const HASH_PREFIX: &'static str; const DERIVER_NAME: (); // Unused here for now fn get_salt_phrase() -> &'static LazyParam; @@ -983,8 +981,6 @@ pub mod zkapp_command { /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/zkapp_account.ml#L100 impl MakeEvents for Events { - const SALT_PHRASE: &'static str = "MinaZkappEventsEmpty"; - const HASH_PREFIX: &'static str = "MinaZkappEvents"; const DERIVER_NAME: () = (); fn get_salt_phrase() -> &'static LazyParam { &NO_INPUT_MINA_ZKAPP_EVENTS_EMPTY @@ -1002,8 +998,6 @@ pub mod zkapp_command { /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/zkapp_account.ml#L156 impl MakeEvents for Actions { - const SALT_PHRASE: &'static str = "MinaZkappActionsEmpty"; - const HASH_PREFIX: &'static str = "MinaZkappSeqEvents"; const DERIVER_NAME: () = (); fn get_salt_phrase() -> &'static LazyParam { &NO_INPUT_MINA_ZKAPP_ACTIONS_EMPTY @@ -2837,9 +2831,7 @@ pub mod zkapp_command { /// https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/account_update.ml#L1327 pub fn digest(&self) -> Fp { - self.hash_with_param( - (openmina_core::NetworkConfig::global().account_update_hash_param)() - ) + self.hash_with_param(openmina_core::NetworkConfig::global().account_update_hash_param) } pub fn timing(&self) -> SetOrKeep { @@ -3140,8 +3132,6 @@ pub mod zkapp_command { } impl Tree { - pub const HASH_PARAM: &'static str = "MinaAcctUpdateNode"; - // TODO: Cache this result somewhere ? pub fn digest(&self) -> Fp { let stack_hash = match self.calls.0.first() { @@ -3193,8 +3183,6 @@ pub mod zkapp_command { this: TokenId, } - pub const ACCOUNT_UPDATE_CONS_HASH_PARAM: &str = "MinaAcctUpdateCons"; - pub trait AccountUpdateRef { fn account_update_ref(&self) -> &AccountUpdate; } @@ -5359,10 +5347,10 @@ pub mod local_state { if self.is_default { use crate::proofs::transaction::transaction_snark::checked_hash3; - checked_hash3("MinaAcctUpdStckFrm", &fields, w) + checked_hash3(&MINA_ACCOUNT_UPDATE_STACK_FRAME, &fields, w) } else { use crate::proofs::transaction::transaction_snark::checked_hash; - checked_hash("MinaAcctUpdStckFrm", &fields, w) + checked_hash(&MINA_ACCOUNT_UPDATE_STACK_FRAME, &fields, w) } } } @@ -7549,11 +7537,12 @@ pub fn checked_cons_signed_command_payload( ) -> ReceiptChainHash { use crate::proofs::transaction::legacy_input::CheckedLegacyInput; use crate::proofs::transaction::transaction_snark::checked_legacy_hash; + use ::poseidon::hash::legacy; let mut inputs = payload.to_checked_legacy_input_owned(w); inputs.append_field(last_receipt_chain_hash.0); - let receipt_chain_hash = checked_legacy_hash(ReceiptChainHash::HASH_PREFIX, inputs, w); + let receipt_chain_hash = checked_legacy_hash(&legacy::params::CODA_RECEIPT_UC, inputs, w); ReceiptChainHash(receipt_chain_hash) } diff --git a/ledger/src/sparse_ledger/sparse_ledger_impl.rs b/ledger/src/sparse_ledger/sparse_ledger_impl.rs index 6c6443823c..963280c46a 100644 --- a/ledger/src/sparse_ledger/sparse_ledger_impl.rs +++ b/ledger/src/sparse_ledger/sparse_ledger_impl.rs @@ -156,7 +156,7 @@ impl SparseLedgerImpl { let mut current = account.hash(); // Go back from the account to root, to compute missing hashes - for (depth, path) in merkle_path.iter().enumerate() { + for (height, path) in merkle_path.iter().enumerate() { set_hash(addr.clone(), ¤t); let hashes = match path { @@ -164,7 +164,7 @@ impl SparseLedgerImpl { MerklePath::Right(left) => [*left, current], }; - let param = get_merkle_param_for_height(depth); + let param = get_merkle_param_for_height(height); current = poseidon::hash::hash_with_kimchi(param, &hashes); addr = addr.parent().unwrap(); diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs index 5d17dd63e8..86a7f363d9 100644 --- a/ledger/src/verifier/mod.rs +++ b/ledger/src/verifier/mod.rs @@ -388,7 +388,7 @@ pub mod common { let Pallas { x, y, .. } = pubkey.point(); let Signature { rx, s } = signature; - let signature_prefix = (openmina_core::NetworkConfig::global().signature_prefix)(); + let signature_prefix = openmina_core::NetworkConfig::global().signature_prefix; let hash = hash_with_kimchi(signature_prefix, &[**msg, *x, *y, *rx]); let hash: Fq = Fq::try_from(hash.into_repr()).unwrap(); // Never fail, `Fq` is larger than `Fp` @@ -419,7 +419,7 @@ pub mod common { let Pallas { x, y, .. } = pubkey.point(); let Signature { rx, s } = signature; - let signature_prefix = (openmina_core::NetworkConfig::global().legacy_signature_prefix)(); + let signature_prefix = openmina_core::NetworkConfig::global().legacy_signature_prefix; let mut inputs = msg.to_input_legacy(); inputs.append_field(*x); diff --git a/ledger/src/zkapps/snark.rs b/ledger/src/zkapps/snark.rs index 0e5cb4cf25..748dc995b8 100644 --- a/ledger/src/zkapps/snark.rs +++ b/ledger/src/zkapps/snark.rs @@ -1,9 +1,16 @@ -use std::{cell::Cell, fmt::Write, marker::PhantomData}; +use std::{cell::Cell, marker::PhantomData}; use ark_ff::Zero; use mina_hasher::Fp; use mina_signer::CompressedPubKey; -use poseidon::hash::Inputs; +use poseidon::hash::{ + params::{ + get_merkle_param_for_height, CODA_RECEIPT_UC, MINA_ACCOUNT_UPDATE_CONS, + MINA_ACCOUNT_UPDATE_NODE, MINA_ACCOUNT_UPDATE_STACK_FRAME_CONS, MINA_DERIVE_TOKEN_ID, + MINA_SIDELOADED_VK, MINA_ZKAPP_ACCOUNT, MINA_ZKAPP_SEQ_EVENTS, + }, + Inputs, +}; use crate::{ checked_equal_compressed_key, checked_equal_compressed_key_const_and, @@ -28,8 +35,7 @@ use crate::{ local_state::{StackFrame, StackFrameChecked, StackFrameCheckedFrame, WithLazyHash}, zkapp_command::{ self, AccountUpdate, AccountUpdateSkeleton, CallForest, CheckAuthorizationResult, - ClosedInterval, OrIgnore, SetOrKeep, Tree, WithHash, - ACCOUNT_UPDATE_CONS_HASH_PARAM, + ClosedInterval, OrIgnore, SetOrKeep, WithHash, }, zkapp_statement::ZkappStatement, TimingValidation, TransactionFailure, @@ -38,7 +44,7 @@ use crate::{ sparse_ledger::SparseLedger, zkapps::zkapp_logic, Account, AccountId, AppendToInputs, AuthRequired, AuthRequiredEncoded, MyCow, ReceiptChainHash, - ToInputs, TokenId, VerificationKey, VerificationKeyWire, ZkAppAccount, TXN_VERSION_CURRENT, + ToInputs, TokenId, VerificationKeyWire, ZkAppAccount, TXN_VERSION_CURRENT, }; use super::{ @@ -177,7 +183,7 @@ impl ZkappHandler for SnarkHandler { let account2 = account.clone(); let account = WithLazyHash::new(account, move |w: &mut Witness| { let zkapp = MyCow::borrow_or_default(&account2.zkapp); - zkapp.checked_hash_with_param(ZkAppAccount::HASH_PARAM, w); + zkapp.checked_hash_with_param(&MINA_ZKAPP_ACCOUNT, w); account2.checked_hash(w) }); account @@ -280,8 +286,8 @@ impl CallForestInterface for SnarkCallForest { let account_update = w.exists(&account_update.body); let account_update = { let account_update_hash_param = - (openmina_core::NetworkConfig::global().account_update_hash_param)(); - let hash = account_update.checked_hash_with_param(account_update_hash_param.string, w); + openmina_core::NetworkConfig::global().account_update_hash_param; + let hash = account_update.checked_hash_with_param(account_update_hash_param, w); WithHash { data: account_update.clone(), hash, @@ -300,9 +306,8 @@ impl CallForestInterface for SnarkCallForest { [x, ..] => x.stack_hash.get().unwrap(), // Never fail, it was already hashed }); let tree_hash = [account_update.hash, subforest.hash] - .checked_hash_with_param(Tree::::HASH_PARAM, w); - let _hash_cons = - [tree_hash, tl_hash].checked_hash_with_param(ACCOUNT_UPDATE_CONS_HASH_PARAM, w); + .checked_hash_with_param(&MINA_ACCOUNT_UPDATE_NODE, w); + let _hash_cons = [tree_hash, tl_hash].checked_hash_with_param(&MINA_ACCOUNT_UPDATE_CONS, w); let account = Self::AccountUpdate { body: account_update, authorization: auth.clone(), @@ -412,7 +417,7 @@ impl StackFrameInterface for StackFrameChecked { /// Call_stack_digest.Checked.cons fn call_stack_digest_checked_cons(h: Fp, t: Fp, w: &mut Witness) -> Fp { - checked_hash("MinaActUpStckFrmCons", &[h, t], w) + checked_hash(&MINA_ACCOUNT_UPDATE_STACK_FRAME_CONS, &[h, t], w) } impl StackInterface for WithHash>>> { @@ -874,7 +879,7 @@ impl AccountInterface for SnarkAccount { .as_ref() .unwrap(); let vk = w.exists(vk.vk()); - vk.checked_hash_with_param(VerificationKey::HASH_PARAM, w); + vk.checked_hash_with_param(&MINA_SIDELOADED_VK, w); } Signature | NoneGiven => {} } @@ -982,18 +987,16 @@ impl AccountInterface for SnarkAccount { } fn implied_root(account: &SnarkAccount, incl: &[(Boolean, Fp)], w: &mut Witness) -> Fp { - let mut param = String::with_capacity(16); incl.iter() .enumerate() - .fold(account.hash(w), |accum: Fp, (depth, (is_right, h))| { + .fold(account.hash(w), |accum: Fp, (height, (is_right, h))| { let hashes = match is_right { Boolean::False => [accum, *h], Boolean::True => [*h, accum], }; - param.clear(); - write!(&mut param, "MinaMklTree{:03}", depth).unwrap(); + let param = get_merkle_param_for_height(height); w.exists(hashes); - checked_hash(param.as_str(), &hashes, w) + checked_hash(param, &hashes, w) }) } @@ -1024,7 +1027,7 @@ impl LedgerInterface for LedgerWithHash { let account2 = account.0.clone(); let account = WithLazyHash::new(account.0, move |w: &mut Witness| { let zkapp = MyCow::borrow_or_default(&account2.zkapp); - zkapp.checked_hash_with_param(ZkAppAccount::HASH_PARAM, w); + zkapp.checked_hash_with_param(&MINA_ZKAPP_ACCOUNT, w); account2.checked_hash(w) }); let inclusion = w.exists( @@ -1107,7 +1110,7 @@ impl AccountIdInterface for SnarkAccountId { type W = Witness; fn derive_token_id(account_id: &AccountId, w: &mut Self::W) -> TokenId { - TokenId(account_id.checked_hash_with_param(AccountId::DERIVE_TOKEN_ID_HASH_PARAM, w)) + TokenId(account_id.checked_hash_with_param(&MINA_DERIVE_TOKEN_ID, w)) } } @@ -1216,7 +1219,7 @@ impl TransactionCommitmentInterface for SnarkTransactionCommitment { let fee_payer_hash = account_updates.body.hash; [memo_hash, fee_payer_hash, commitment] - .checked_hash_with_param(ACCOUNT_UPDATE_CONS_HASH_PARAM, w) + .checked_hash_with_param(&MINA_ACCOUNT_UPDATE_CONS, w) } } @@ -1367,10 +1370,8 @@ impl ActionsInterface for SnarkActions { } fn push_events(event: Fp, actions: &zkapp_command::Actions, w: &mut Self::W) -> Fp { - use zkapp_command::MakeEvents; - let hash = zkapp_command::events_to_field(actions); - checked_hash(zkapp_command::Actions::HASH_PREFIX, &[event, hash], w) + checked_hash(&MINA_ZKAPP_SEQ_EVENTS, &[event, hash], w) } } @@ -1390,11 +1391,7 @@ impl ReceiptChainHashInterface for SnarkReceiptChainHash { inputs.append_field(element); inputs.append(&other); - ReceiptChainHash(checked_hash( - ReceiptChainHash::HASH_PREFIX, - &inputs.to_fields(), - w, - )) + ReceiptChainHash(checked_hash(&CODA_RECEIPT_UC, &inputs.to_fields(), w)) } } diff --git a/poseidon/src/hash.rs b/poseidon/src/hash.rs index 229b9f5523..875e547c69 100644 --- a/poseidon/src/hash.rs +++ b/poseidon/src/hash.rs @@ -228,11 +228,19 @@ pub fn hash_noinputs(param: &LazyParam) -> Fp { *last_squeezed } +#[derive(Debug)] +#[allow(dead_code)] // `string` is never read pub struct LazyParam { sponge_state: crate::SpongeState, state: [Fp; 3], last_squeezed: Fp, - pub string: &'static str, + string: &'static str, +} + +impl LazyParam { + pub fn state(&self) -> [Fp; 3] { + self.state + } } pub mod params { @@ -263,6 +271,8 @@ pub mod params { {MINA_DERIVE_TOKEN_ID, "MinaDeriveTokenId"}, {MINA_EPOCH_SEED, "MinaEpochSeed"}, {MINA_SIDELOADED_VK, "MinaSideLoadedVk"}, + {MINA_VRF_MESSAGE, "MinaVrfMessage"}, + {MINA_VRF_OUTPUT, "MinaVrfOutput"}, {CODA_RECEIPT_UC, "CodaReceiptUC"}, {COINBASE_STACK, "CoinbaseStack"}, @@ -270,6 +280,7 @@ pub mod params { {MINA_ACCOUNT_UPDATE_CONS, "MinaAcctUpdateCons"}, {MINA_ACCOUNT_UPDATE_NODE, "MinaAcctUpdateNode"}, {MINA_ACCOUNT_UPDATE_STACK_FRAME, "MinaAcctUpdStckFrm"}, + {MINA_ACCOUNT_UPDATE_STACK_FRAME_CONS, "MinaActUpStckFrmCons"}, {MINA_ZKAPP_ACCOUNT, "MinaZkappAccount"}, {MINA_ZKAPP_MEMO, "MinaZkappMemo"}, diff --git a/snark/src/merkle_path/mod.rs b/snark/src/merkle_path/mod.rs index df461bd0ed..837d8e7302 100644 --- a/snark/src/merkle_path/mod.rs +++ b/snark/src/merkle_path/mod.rs @@ -13,13 +13,13 @@ pub fn calc_merkle_root_hash( let account: ledger::Account = account.try_into()?; let mut child_hash = account.hash(); - for (depth, path) in merkle_path.iter().enumerate() { + for (height, path) in merkle_path.iter().enumerate() { let hashes = match path { MerkleTreeNode::Left(right) => [child_hash, right.to_field()?], MerkleTreeNode::Right(left) => [left.to_field()?, child_hash], }; - let param = get_merkle_param_for_height(depth); + let param = get_merkle_param_for_height(height); child_hash = poseidon::hash::hash_with_kimchi(param, &hashes) } From 8528abd7de4f8990b61b13b2166608025a165c40 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Sun, 24 Nov 2024 11:28:30 +0100 Subject: [PATCH 107/175] Use `LazyParam` in `vrf` crate --- Cargo.lock | 1 + ledger/src/account/account.rs | 3 +-- ledger/src/database/database.rs | 4 +--- poseidon/src/hash.rs | 8 +------- vrf/Cargo.toml | 1 + vrf/src/message.rs | 31 +++++++++++-------------------- vrf/src/output.rs | 29 ++++++++++++++--------------- 7 files changed, 30 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9e78aca91..a67e7f3240 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7907,6 +7907,7 @@ dependencies = [ "num", "o1-utils", "openmina-node-account", + "poseidon", "rand", "redux", "serde", diff --git a/ledger/src/account/account.rs b/ledger/src/account/account.rs index 0683fbfb71..79a4bc8ba2 100644 --- a/ledger/src/account/account.rs +++ b/ledger/src/account/account.rs @@ -1516,8 +1516,7 @@ impl Account { } pub fn hash(&self) -> Fp { - let inputs = self.to_inputs_owned(); - hash_with_kimchi(&MINA_ACCOUNT, &inputs.to_fields()) + self.hash_with_param(&MINA_ACCOUNT) } pub fn checked_hash(&self, w: &mut Witness) -> Fp { diff --git a/ledger/src/database/database.rs b/ledger/src/database/database.rs index f72cc0db73..da1739bf7f 100644 --- a/ledger/src/database/database.rs +++ b/ledger/src/database/database.rs @@ -560,15 +560,13 @@ export function performance_now() { #[test] fn test_hash_empty() { - let heights = [0, 5, 10, 11, 100, 2000]; + let heights = [0, 5, 10, 11]; let hexs = [ "f3ee39f42a7b2cac196c8eb1c9fe00f853678c920c0c9ce3724c0b7fe911c731", "d305ebed68f3d4ff16cfc9c6857c274bfbd4a5e83db6fb26e009f75711005524", "bfae9c6290bcc9cf282889c6b880e4eac236d4e50b22395639731e1465939915", "def7de4e2f2f13aa638f5671eccf9367ab9d39ae49ed683fca0169b33b31c416", - "145494b371b318e94e1976e4b67768a6b1793841b47a6269996354e93d5c603c", - "00fb3327a47dc00f9b04e5c5c59af2851501cb9e602a03908f1ec7b04453540c", ]; let result: Vec<_> = heights diff --git a/poseidon/src/hash.rs b/poseidon/src/hash.rs index 875e547c69..a9f688e106 100644 --- a/poseidon/src/hash.rs +++ b/poseidon/src/hash.rs @@ -417,13 +417,7 @@ pub mod params { {NO_INPUT_ZKAPP_ACTION_STATE_EMPTY_ELT, "MinaZkappActionStateEmptyElt"}, {NO_INPUT_COINBASE_STACK, "CoinbaseStack"}, {NO_INPUT_MINA_ZKAPP_EVENTS_EMPTY, "MinaZkappEventsEmpty"}, - {NO_INPUT_MINA_ZKAPP_ACTIONS_EMPTY, "MinaZkappActionsEmpty"}, - - {NO_INPUT_MINA_PROTO_STATE, "MinaProtoState"}, - {NO_INPUT_MINA_PROTO_STATE_BODY, "MinaProtoStateBody"}, - {NO_INPUT_MINA_DERIVE_TOKEN_ID, "MinaDeriveTokenId"}, - {NO_INPUT_MINA_EPOCH_SEED, "MinaEpochSeed"}, - {NO_INPUT_MINA_SIDELOADED_VK, "MinaSideLoadedVk"} + {NO_INPUT_MINA_ZKAPP_ACTIONS_EMPTY, "MinaZkappActionsEmpty"} ); } diff --git a/vrf/Cargo.toml b/vrf/Cargo.toml index cf4f4c9d6f..9ff8ca72fe 100644 --- a/vrf/Cargo.toml +++ b/vrf/Cargo.toml @@ -18,6 +18,7 @@ mina-curves = { workspace = true } o1-utils = { workspace = true } ledger = { workspace = true } openmina-node-account = { workspace = true } +poseidon = { workspace = true } ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std" ] } ark-ec = { version = "0.3.0", features = [ "std" ] } ark-serialize = { version = "0.3.0", features = [ "std" ] } diff --git a/vrf/src/message.rs b/vrf/src/message.rs index e46f645c64..4cf0ba22c3 100644 --- a/vrf/src/message.rs +++ b/vrf/src/message.rs @@ -1,9 +1,10 @@ use ark_ff::{One, SquareRootField, Zero}; +use ledger::ToInputs; use mina_curves::pasta::curves::pallas::Pallas as CurvePoint; -use mina_hasher::{create_kimchi, Hashable, Hasher, ROInput}; use mina_p2p_messages::v2::EpochSeed; use o1_utils::FieldHelpers; +use poseidon::hash::{params::MINA_VRF_MESSAGE, Inputs}; use serde::{Deserialize, Serialize}; use super::{BaseField, VrfError, VrfResult}; @@ -27,8 +28,7 @@ impl VrfMessage { } pub fn hash(&self) -> BaseField { - let mut hasher = create_kimchi::(()); - hasher.update(self).digest() + self.hash_with_param(&MINA_VRF_MESSAGE) } pub fn to_group(&self) -> VrfResult { @@ -88,10 +88,8 @@ impl VrfMessage { } } -impl Hashable for VrfMessage { - type D = (); - - fn to_roinput(&self) -> ROInput { +impl ToInputs for VrfMessage { + fn to_inputs(&self, inputs: &mut Inputs) { let epoch_seed = match self.epoch_seed.to_field() { Ok(epoch_seed) => epoch_seed, Err(_) => { @@ -99,21 +97,14 @@ impl Hashable for VrfMessage { mina_hasher::Fp::zero() } }; - let mut roi = ROInput::new().append_field(epoch_seed); - + inputs.append_field(epoch_seed); for i in (0..LEDGER_DEPTH).rev() { - roi = if self.delegator_index >> i & 1u64 == 1 { - roi.append_bool(true) + if self.delegator_index >> i & 1u64 == 1 { + inputs.append_bool(true); } else { - roi.append_bool(false) - }; + inputs.append_bool(false); + } } - - roi = roi.append_u32(self.global_slot); - roi - } - - fn domain_string(_: Self::D) -> Option { - "MinaVrfMessage".to_string().into() + inputs.append_u32(self.global_slot); } } diff --git a/vrf/src/output.rs b/vrf/src/output.rs index 4226d27161..bfb92dc631 100644 --- a/vrf/src/output.rs +++ b/vrf/src/output.rs @@ -1,8 +1,10 @@ +use ark_ec::short_weierstrass_jacobian::GroupAffine; use ark_ff::{BigInteger, BigInteger256, PrimeField}; -use mina_hasher::{create_kimchi, Hashable, Hasher, ROInput}; +use ledger::{AppendToInputs, ToInputs}; use mina_p2p_messages::v2::ConsensusVrfOutputTruncatedStableV1; use num::{BigInt, BigRational, One, ToPrimitive}; use o1_utils::FieldHelpers; +use poseidon::hash::params::MINA_VRF_OUTPUT; use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; @@ -25,18 +27,16 @@ impl VrfOutputHashInput { } } -impl Hashable for VrfOutputHashInput { - type D = (); +impl ToInputs for VrfOutputHashInput { + fn to_inputs(&self, inputs: &mut poseidon::hash::Inputs) { + let Self { + message, + g: GroupAffine { x, y, .. }, + } = self; - fn to_roinput(&self) -> ROInput { - ROInput::new() - .append_roinput(self.message.to_roinput()) - .append_field(self.g.x) - .append_field(self.g.y) - } - - fn domain_string(_: Self::D) -> Option { - "MinaVrfOutput".to_string().into() + inputs.append(message); + inputs.append(x); + inputs.append(y); } } @@ -57,9 +57,8 @@ impl VrfOutput { } pub fn hash(&self) -> BaseField { - let vrf_output_hash_input = VrfOutputHashInput::new(self.message.clone(), self.output); - let mut hasher = create_kimchi::(()); - hasher.update(&vrf_output_hash_input).digest() + let hash_input = VrfOutputHashInput::new(self.message.clone(), self.output); + hash_input.hash_with_param(&MINA_VRF_OUTPUT) } pub fn truncated(&self) -> ScalarField { From b4256cce9198c8344b6d40f2197535484557a373 Mon Sep 17 00:00:00 2001 From: Sebastien Chapuis Date: Sun, 24 Nov 2024 12:33:40 +0100 Subject: [PATCH 108/175] Update `proof-systems` --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a67e7f3240..a8653b305c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2393,7 +2393,7 @@ dependencies = [ [[package]] name = "groupmap" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ec", "ark-ff", @@ -2902,7 +2902,7 @@ dependencies = [ [[package]] name = "internal-tracing" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" [[package]] name = "io-lifetimes" @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "kimchi" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ec", "ark-ff", @@ -3729,7 +3729,7 @@ dependencies = [ [[package]] name = "mina-curves" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ec", "ark-ff", @@ -3738,7 +3738,7 @@ dependencies = [ [[package]] name = "mina-hasher" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ff", "bitvec", @@ -3791,7 +3791,7 @@ dependencies = [ [[package]] name = "mina-poseidon" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ec", "ark-ff", @@ -3808,7 +3808,7 @@ dependencies = [ [[package]] name = "mina-signer" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ec", "ark-ff", @@ -4427,7 +4427,7 @@ dependencies = [ [[package]] name = "o1-utils" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ec", "ark-ff", @@ -5285,7 +5285,7 @@ dependencies = [ [[package]] name = "poly-commitment" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ec", "ark-ff", @@ -7656,7 +7656,7 @@ dependencies = [ [[package]] name = "turshi" version = "0.1.0" -source = "git+https://github.com/openmina/proof-systems?rev=2fdb5a7#2fdb5a75c61e2ac1db452bd813aa12fd9fb77527" +source = "git+https://github.com/openmina/proof-systems?rev=d0cd63b#d0cd63b360aa0681fe649596779dab507a0a4f3f" dependencies = [ "ark-ff", "hex", diff --git a/Cargo.toml b/Cargo.toml index a3b2654a28..5fc97af3fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,13 +45,13 @@ indexing_slicing = "warn" mina-p2p-messages = { path = "mina-p2p-messages" } poseidon = { path = "poseidon" } ledger = { path = "ledger", package = "mina-tree" } -mina-hasher = { git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7" } -mina-signer = { git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7" } -mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7" } -o1-utils = { git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7" } -kimchi = { git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7" } -mina-poseidon = {git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7"} -poly-commitment = {git = "https://github.com/openmina/proof-systems", rev = "2fdb5a7"} +mina-hasher = { git = "https://github.com/openmina/proof-systems", rev = "d0cd63b" } +mina-signer = { git = "https://github.com/openmina/proof-systems", rev = "d0cd63b" } +mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "d0cd63b" } +o1-utils = { git = "https://github.com/openmina/proof-systems", rev = "d0cd63b" } +kimchi = { git = "https://github.com/openmina/proof-systems", rev = "d0cd63b" } +mina-poseidon = {git = "https://github.com/openmina/proof-systems", rev = "d0cd63b"} +poly-commitment = {git = "https://github.com/openmina/proof-systems", rev = "d0cd63b"} libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false } vrf = { path = "vrf" } openmina-node-account = { path = "node/account" } From 780129dab6e133542220dce67583bb3af5676cc8 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Sat, 9 Nov 2024 17:32:44 +0400 Subject: [PATCH 109/175] fix(node): add validation for block time --- mina-p2p-messages/src/v2/manual.rs | 6 ++++ node/src/consensus/consensus_actions.rs | 4 ++- node/src/p2p/peer/p2p_peer_actions.rs | 5 ++++ node/src/state.rs | 38 +++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) diff --git a/mina-p2p-messages/src/v2/manual.rs b/mina-p2p-messages/src/v2/manual.rs index cd12a08a20..2eb2e4b172 100644 --- a/mina-p2p-messages/src/v2/manual.rs +++ b/mina-p2p-messages/src/v2/manual.rs @@ -1532,6 +1532,12 @@ impl From for BlockTimeTimeStableV1 { } } +impl MinaBlockHeaderStableV2 { + pub fn genesis_state_hash(&self) -> &StateHash { + &self.protocol_state.body.genesis_state_hash + } +} + impl StagedLedgerDiffBodyStableV1 { pub fn diff(&self) -> &StagedLedgerDiffDiffDiffStableV2 { &self.staged_ledger_diff.diff diff --git a/node/src/consensus/consensus_actions.rs b/node/src/consensus/consensus_actions.rs index a35ab7d6ff..a9984ab016 100644 --- a/node/src/consensus/consensus_actions.rs +++ b/node/src/consensus/consensus_actions.rs @@ -69,7 +69,9 @@ impl redux::EnablingCondition for ConsensusAction { hash: hash.clone(), block: block.clone() }; - !block.is_genesis() && !state.consensus.blocks.contains_key(hash) + !block.is_genesis() + && !state.consensus.blocks.contains_key(hash) + && state.prevalidate_block(&block) }, ConsensusAction::BlockChainProofUpdate { hash, .. } => { (state.consensus.best_tip.as_ref() == Some(hash) diff --git a/node/src/p2p/peer/p2p_peer_actions.rs b/node/src/p2p/peer/p2p_peer_actions.rs index 433f43cd32..be1fc67448 100644 --- a/node/src/p2p/peer/p2p_peer_actions.rs +++ b/node/src/p2p/peer/p2p_peer_actions.rs @@ -2,6 +2,11 @@ use super::*; impl redux::EnablingCondition for P2pPeerAction { fn is_enabled(&self, state: &crate::State, time: redux::Timestamp) -> bool { + if let P2pPeerAction::BestTipUpdate { best_tip, .. } = self { + if !state.prevalidate_block(best_tip) { + return false; + } + } state.p2p.is_enabled(self, time) } } diff --git a/node/src/state.rs b/node/src/state.rs index 73fea89b61..beae943791 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -356,6 +356,44 @@ impl State { }) } + pub fn prevalidate_block(&self, block: &ArcBlockWithHash) -> bool { + let Some((genesis, cur_global_slot)) = + None.or_else(|| Some((self.genesis_block()?, self.cur_global_slot()?))) + else { + // we don't have genesis block. This should be impossible + // because we don't even know chain_id before we have genesis + // block, so we can't be connected to any peers from which + // we would receive a block. + return false; + }; + + // received_at_valid_time + // https://github.com/minaprotocol/mina/blob/6af211ad58e9356f00ea4a636cea70aa8267c072/src/lib/consensus/proof_of_stake.ml#L2746 + { + let block_global_slot = block.global_slot(); + + let delta = genesis.constants().delta.as_u32(); + if cur_global_slot < block_global_slot { + // Too_early + return false; + } else if cur_global_slot.saturating_sub(block_global_slot) > delta { + // Too_late + return false; + } + } + + if block.constants() != genesis.constants() { + return false; + } + + if block.header().genesis_state_hash() != genesis.hash() { + return false; + } + + // TODO(binier): more checks. + true + } + pub fn should_log_node_id(&self) -> bool { self.config.testing_run } From dc3f17c4eaa9247a6c253abc1f5c7bee800ae10d Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Thu, 21 Nov 2024 12:48:49 -0300 Subject: [PATCH 110/175] feat(consensus): Prevalidate blocks in reducers not enabling conditions Add more checks to prevalidation. Also use error type for validation failure instead of boolean. --- node/src/action_kind.rs | 6 +- node/src/consensus/consensus_actions.rs | 20 ++++-- node/src/consensus/consensus_reducer.rs | 31 ++++++++- node/src/consensus/consensus_state.rs | 6 ++ node/src/p2p/peer/p2p_peer_actions.rs | 5 -- node/src/state.rs | 83 +++++++++++++++++++++---- 6 files changed, 128 insertions(+), 23 deletions(-) diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 1009e04c8b..a74fbaebf2 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -162,6 +162,8 @@ pub enum ActionKind { CheckTimeouts, ConsensusBestTipUpdate, ConsensusBlockChainProofUpdate, + ConsensusBlockPrevalidateError, + ConsensusBlockPrevalidateSuccess, ConsensusBlockReceived, ConsensusBlockSnarkVerifyError, ConsensusBlockSnarkVerifyPending, @@ -716,7 +718,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 599; + pub const COUNT: u16 = 601; } impl std::fmt::Display for ActionKind { @@ -857,6 +859,8 @@ impl ActionKindGet for ConsensusAction { fn kind(&self) -> ActionKind { match self { Self::BlockReceived { .. } => ActionKind::ConsensusBlockReceived, + Self::BlockPrevalidateSuccess { .. } => ActionKind::ConsensusBlockPrevalidateSuccess, + Self::BlockPrevalidateError { .. } => ActionKind::ConsensusBlockPrevalidateError, Self::BlockChainProofUpdate { .. } => ActionKind::ConsensusBlockChainProofUpdate, Self::BlockSnarkVerifyPending { .. } => ActionKind::ConsensusBlockSnarkVerifyPending, Self::BlockSnarkVerifySuccess { .. } => ActionKind::ConsensusBlockSnarkVerifySuccess, diff --git a/node/src/consensus/consensus_actions.rs b/node/src/consensus/consensus_actions.rs index a9984ab016..0aeb10923a 100644 --- a/node/src/consensus/consensus_actions.rs +++ b/node/src/consensus/consensus_actions.rs @@ -9,6 +9,7 @@ use snark::block_verify::SnarkBlockVerifyError; use crate::consensus::ConsensusBlockStatus; use crate::snark::block_verify::SnarkBlockVerifyId; +use crate::state::BlockPrevalidationError; pub type ConsensusActionWithMeta = redux::ActionWithMeta; pub type ConsensusActionWithMetaRef<'a> = redux::ActionWithMeta<&'a ConsensusAction>; @@ -24,6 +25,13 @@ pub enum ConsensusAction { block: Arc, chain_proof: Option<(Vec, ArcBlockWithHash)>, }, + BlockPrevalidateSuccess { + hash: StateHash, + }, + BlockPrevalidateError { + hash: StateHash, + error: BlockPrevalidationError, + }, BlockChainProofUpdate { hash: StateHash, chain_proof: (Vec, ArcBlockWithHash), @@ -69,10 +77,14 @@ impl redux::EnablingCondition for ConsensusAction { hash: hash.clone(), block: block.clone() }; - !block.is_genesis() - && !state.consensus.blocks.contains_key(hash) - && state.prevalidate_block(&block) + !block.is_genesis() && !state.consensus.blocks.contains_key(hash) }, + ConsensusAction::BlockPrevalidateSuccess { hash } + | ConsensusAction::BlockPrevalidateError { hash, .. } => state + .consensus + .blocks + .get(hash) + .map_or(false, |block| block.status.is_received()), ConsensusAction::BlockChainProofUpdate { hash, .. } => { (state.consensus.best_tip.as_ref() == Some(hash) && state.consensus.best_tip_chain_proof.is_none()) @@ -87,7 +99,7 @@ impl redux::EnablingCondition for ConsensusAction { .consensus .blocks .get(hash) - .map_or(false, |block| block.status.is_received()) + .map_or(false, |block| block.status.is_prevalidated()) && state.snark.block_verify.jobs.contains(*req_id) }, ConsensusAction::BlockSnarkVerifySuccess { hash } => { diff --git a/node/src/consensus/consensus_reducer.rs b/node/src/consensus/consensus_reducer.rs index 2db1931633..780741ab3d 100644 --- a/node/src/consensus/consensus_reducer.rs +++ b/node/src/consensus/consensus_reducer.rs @@ -1,5 +1,5 @@ use openmina_core::{ - block::BlockHash, + block::{ArcBlockWithHash, BlockHash}, bug_condition, consensus::{is_short_range_fork, long_range_fork_take, short_range_fork_take}, }; @@ -48,9 +48,33 @@ impl ConsensusState { ); // Dispatch + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + + let hash = hash.clone(); + let block = ArcBlockWithHash { + hash: hash.clone(), + block: block.clone(), + }; + match state.prevalidate_block(&block) { + Ok(()) => { + dispatcher.push(ConsensusAction::BlockPrevalidateSuccess { hash }); + } + Err(error) => { + dispatcher.push(ConsensusAction::BlockPrevalidateError { hash, error }); + } + } + } + ConsensusAction::BlockPrevalidateSuccess { hash } => { + let Some(block) = state.blocks.get_mut(hash) else { + return; + }; + block.status = ConsensusBlockStatus::Prevalidated; + + // Dispatch + let block = (hash.clone(), block.block.clone()).into(); let dispatcher = state_context.into_dispatcher(); dispatcher.push(SnarkBlockVerifyAction::Init { - block: (hash.clone(), block.clone()).into(), + block, on_init: redux::callback!( on_received_block_snark_verify_init((hash: BlockHash, req_id: SnarkBlockVerifyId)) -> crate::Action { ConsensusAction::BlockSnarkVerifyPending { hash, req_id } @@ -65,6 +89,9 @@ impl ConsensusState { }), }); } + ConsensusAction::BlockPrevalidateError { hash, .. } => { + state.blocks.remove(hash); + } ConsensusAction::BlockChainProofUpdate { hash, chain_proof } => { if state.best_tip.as_ref() == Some(hash) { state.best_tip_chain_proof = Some(chain_proof.clone()); diff --git a/node/src/consensus/consensus_state.rs b/node/src/consensus/consensus_state.rs index bfa5abc1f4..39a8f2a61b 100644 --- a/node/src/consensus/consensus_state.rs +++ b/node/src/consensus/consensus_state.rs @@ -44,6 +44,7 @@ pub enum ConsensusBlockStatus { Received { time: redux::Timestamp, }, + Prevalidated, SnarkVerifyPending { time: redux::Timestamp, req_id: SnarkBlockVerifyId, @@ -73,6 +74,10 @@ impl ConsensusBlockStatus { matches!(self, Self::Received { .. }) } + pub fn is_prevalidated(&self) -> bool { + matches!(self, Self::Prevalidated) + } + pub fn is_snark_verify_pending(&self) -> bool { matches!(self, Self::SnarkVerifyPending { .. }) } @@ -167,6 +172,7 @@ impl ConsensusState { }; match &candidate.status { ConsensusBlockStatus::Received { .. } => false, + ConsensusBlockStatus::Prevalidated => false, ConsensusBlockStatus::SnarkVerifyPending { .. } => false, ConsensusBlockStatus::SnarkVerifySuccess { .. } => false, ConsensusBlockStatus::ForkRangeDetected { .. } => false, diff --git a/node/src/p2p/peer/p2p_peer_actions.rs b/node/src/p2p/peer/p2p_peer_actions.rs index be1fc67448..433f43cd32 100644 --- a/node/src/p2p/peer/p2p_peer_actions.rs +++ b/node/src/p2p/peer/p2p_peer_actions.rs @@ -2,11 +2,6 @@ use super::*; impl redux::EnablingCondition for P2pPeerAction { fn is_enabled(&self, state: &crate::State, time: redux::Timestamp) -> bool { - if let P2pPeerAction::BestTipUpdate { best_tip, .. } = self { - if !state.prevalidate_block(best_tip) { - return false; - } - } state.p2p.is_enabled(self, time) } } diff --git a/node/src/state.rs b/node/src/state.rs index beae943791..c607487e91 100644 --- a/node/src/state.rs +++ b/node/src/state.rs @@ -2,6 +2,7 @@ use std::sync::Arc; use std::time::Duration; use mina_p2p_messages::v2::{MinaBaseUserCommandStableV2, MinaBlockBlockStableV2}; +use openmina_core::constants::PROTOCOL_VERSION; use rand::prelude::*; use openmina_core::block::BlockWithHash; @@ -73,8 +74,27 @@ pub struct State { applied_actions_count: u64, } +#[derive(Serialize, Deserialize, Debug, Clone)] +pub enum BlockPrevalidationError { + GenesisNotReady, + ReceivedTooEarly { + current_global_slot: u32, + block_global_slot: u32, + }, + ReceivedTooLate { + current_global_slot: u32, + block_global_slot: u32, + delta: u32, + }, + InvalidGenesisProtocolState, + InvalidProtocolVersion, + MismatchedProtocolVersion, + ConsantsMismatch, + InvalidDeltaBlockChainProof, +} + // Substate accessors that will be used in reducers -use openmina_core::{impl_substate_access, SubstateAccess}; +use openmina_core::{bug_condition, impl_substate_access, SubstateAccess}; impl_substate_access!(State, SnarkState, snark); impl_substate_access!(State, SnarkBlockVerifyState, snark.block_verify); @@ -356,7 +376,10 @@ impl State { }) } - pub fn prevalidate_block(&self, block: &ArcBlockWithHash) -> bool { + pub fn prevalidate_block( + &self, + block: &ArcBlockWithHash, + ) -> Result<(), BlockPrevalidationError> { let Some((genesis, cur_global_slot)) = None.or_else(|| Some((self.genesis_block()?, self.cur_global_slot()?))) else { @@ -364,7 +387,8 @@ impl State { // because we don't even know chain_id before we have genesis // block, so we can't be connected to any peers from which // we would receive a block. - return false; + bug_condition!("Tried to prevalidate a block before the genesis block was ready"); + return Err(BlockPrevalidationError::GenesisNotReady); }; // received_at_valid_time @@ -375,23 +399,60 @@ impl State { let delta = genesis.constants().delta.as_u32(); if cur_global_slot < block_global_slot { // Too_early - return false; + return Err(BlockPrevalidationError::ReceivedTooEarly { + current_global_slot: cur_global_slot, + block_global_slot, + }); } else if cur_global_slot.saturating_sub(block_global_slot) > delta { // Too_late - return false; + return Err(BlockPrevalidationError::ReceivedTooLate { + current_global_slot: cur_global_slot, + block_global_slot, + delta, + }); } } - if block.constants() != genesis.constants() { - return false; + if block.header().genesis_state_hash() != genesis.hash() { + return Err(BlockPrevalidationError::InvalidGenesisProtocolState); } - if block.header().genesis_state_hash() != genesis.hash() { - return false; + let (protocol_versions_are_valid, protocol_version_matches_daemon) = { + let min_transaction_version = 1.into(); + let v = &block.header().current_protocol_version; + let nv = block + .header() + .proposed_protocol_version_opt + .as_ref() + .unwrap_or(v); + + // Our version values are unsigned, so there is no need to check that the + // other parts are not negative. + let valid = v.transaction >= min_transaction_version + && nv.transaction >= min_transaction_version; + let compatible = v.transaction == PROTOCOL_VERSION.transaction + && v.network == PROTOCOL_VERSION.network; + + (valid, compatible) + }; + + if !protocol_versions_are_valid { + return Err(BlockPrevalidationError::InvalidProtocolVersion); + } else if !protocol_version_matches_daemon { + return Err(BlockPrevalidationError::MismatchedProtocolVersion); + } + + // NOTE: currently these cannot change between blocks, but that + // may not always be true? + if block.constants() != genesis.constants() { + return Err(BlockPrevalidationError::ConsantsMismatch); } - // TODO(binier): more checks. - true + // TODO(tizoc): check for InvalidDeltaBlockChainProof + // https://github.com/MinaProtocol/mina/blob/d800da86a764d8d37ffb8964dd8d54d9f522b358/src/lib/mina_block/validation.ml#L369 + // https://github.com/MinaProtocol/mina/blob/d800da86a764d8d37ffb8964dd8d54d9f522b358/src/lib/transition_chain_verifier/transition_chain_verifier.ml + + Ok(()) } pub fn should_log_node_id(&self) -> bool { From 989a6c4fe338f23cc3c9cc38e550de8c4b964581 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Sun, 24 Nov 2024 15:37:24 -0300 Subject: [PATCH 111/175] fix(scenario): In solo-node-bootstrap scenario, make the initial time match the first block time This is required so that the block prevalidation logic doesn't reject the block for being outside of the slot time window. --- .../src/scenarios/solo_node/bootstrap.rs | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/node/testing/src/scenarios/solo_node/bootstrap.rs b/node/testing/src/scenarios/solo_node/bootstrap.rs index 5293592b93..9ce1101e73 100644 --- a/node/testing/src/scenarios/solo_node/bootstrap.rs +++ b/node/testing/src/scenarios/solo_node/bootstrap.rs @@ -1,6 +1,7 @@ use std::time::Duration; use node::transition_frontier::sync::TransitionFrontierSyncState; +use openmina_core::constants::constraint_constants; use redux::Instant; use crate::{ @@ -19,6 +20,24 @@ use crate::{ #[derive(documented::Documented, Default, Clone, Copy)] pub struct SoloNodeBootstrap; +// TODO(tizoc): this is ugly, do a cleaner conversion or figure out a better way. +// This test will fail if we don't start with this as the initial time because +// the time validation for the first block will reject it. +fn first_block_slot_timestamp_nanos(config: &RustNodeTestingConfig) -> u64 { + let first_block_global_slot = 46891; // Update if replay changes + let protocol_constants = config.genesis.protocol_constants().unwrap(); + let genesis_timestamp_ms = protocol_constants.genesis_state_timestamp.0.as_u64(); + let milliseconds_per_slot = constraint_constants().block_window_duration_ms; + let first_block_global_slot_delta_ms = first_block_global_slot * milliseconds_per_slot; + + // Convert to nanos + genesis_timestamp_ms + .checked_add(first_block_global_slot_delta_ms) + .unwrap() + .checked_mul(1_000_000) + .unwrap() +} + impl SoloNodeBootstrap { pub async fn run(self, mut runner: ClusterRunner<'_>) { use self::TransitionFrontierSyncState::*; @@ -27,10 +46,12 @@ impl SoloNodeBootstrap { let replayer = hosts::replayer(); - let node_id = runner.add_rust_node( - RustNodeTestingConfig::devnet_default() - .initial_peers(vec![ListenerNode::Custom(replayer)]), - ); + let mut config = RustNodeTestingConfig::devnet_default(); + + config.initial_time = redux::Timestamp::new(first_block_slot_timestamp_nanos(&config)); + + let node_id = + runner.add_rust_node(config.initial_peers(vec![ListenerNode::Custom(replayer)])); eprintln!("launch Openmina node with default configuration, id: {node_id}"); let mut timeout = TIMEOUT; From 54b32a92a7bdd0c23fea1ba8279226e25c77f18a Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 25 Nov 2024 10:37:10 +0200 Subject: [PATCH 112/175] Apache SPA Configuration --- frontend/angular.json | 1 - frontend/httpd.conf | 430 ++++------------------------------------ frontend/package.json | 4 +- frontend/src/index.html | 27 +-- 4 files changed, 49 insertions(+), 413 deletions(-) diff --git a/frontend/angular.json b/frontend/angular.json index b5ca30487d..d5c75245ff 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -135,7 +135,6 @@ ], "inlineStyleLanguage": "scss", "assets": [ - "src/favicon.ico", "src/assets" ], "styles": [ diff --git a/frontend/httpd.conf b/frontend/httpd.conf index d49b70c006..c333bb343c 100644 --- a/frontend/httpd.conf +++ b/frontend/httpd.conf @@ -1,68 +1,8 @@ -# -# This is the main Apache HTTP server configuration file. It contains the -# configuration directives that give the server its instructions. -# See for detailed information. -# In particular, see -# -# for a discussion of each configuration directive. -# -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. -# -# Configuration and logfile names: If the filenames you specify for many -# of the server's control files begin with "/" (or "drive:/" for Win32), the -# server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so "logs/access_log" -# with ServerRoot set to "/usr/local/apache2" will be interpreted by the -# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" -# will be interpreted as '/logs/access_log'. -# -# ServerRoot: The top of the directory tree under which the server's -# configuration, error, and log files are kept. -# -# Do not add a slash at the end of the directory path. If you point -# ServerRoot at a non-local disk, be sure to specify a local disk on the -# Mutex directive, if file-based mutexes are used. If you wish to share the -# same ServerRoot for multiple httpd daemons, you will need to change at -# least PidFile. -# ServerRoot "/usr/local/apache2" -# -# Mutex: Allows you to set the mutex mechanism and mutex file directory -# for individual mutexes, or change the global defaults -# -# Uncomment and change the directory if mutexes are file-based and the default -# mutex file directory is not on a local disk or is not appropriate for some -# other reason. -# -# Mutex default:logs - -# -# Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, instead of the default. See also the -# directive. -# -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses. -# -#Listen 12.34.56.78:80 Listen 80 -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Statically compiled modules (those listed by `httpd -l') do not need -# to be loaded here. -# -# Example: -# LoadModule foo_module modules/mod_foo.so -# LoadModule mpm_event_module modules/mod_mpm_event.so #LoadModule mpm_prefork_module modules/mod_mpm_prefork.so #LoadModule mpm_worker_module modules/mod_mpm_worker.so @@ -83,51 +23,14 @@ LoadModule authz_core_module modules/mod_authz_core.so #LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so LoadModule access_compat_module modules/mod_access_compat.so LoadModule auth_basic_module modules/mod_auth_basic.so -#LoadModule auth_form_module modules/mod_auth_form.so -#LoadModule auth_digest_module modules/mod_auth_digest.so -#LoadModule allowmethods_module modules/mod_allowmethods.so -#LoadModule isapi_module modules/mod_isapi.so -#LoadModule file_cache_module modules/mod_file_cache.so -#LoadModule cache_module modules/mod_cache.so -#LoadModule cache_disk_module modules/mod_cache_disk.so -#LoadModule cache_socache_module modules/mod_cache_socache.so -#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so -#LoadModule socache_dbm_module modules/mod_socache_dbm.so -#LoadModule socache_memcache_module modules/mod_socache_memcache.so -#LoadModule socache_redis_module modules/mod_socache_redis.so -#LoadModule watchdog_module modules/mod_watchdog.so -#LoadModule macro_module modules/mod_macro.so -#LoadModule dbd_module modules/mod_dbd.so -#LoadModule bucketeer_module modules/mod_bucketeer.so -#LoadModule dumpio_module modules/mod_dumpio.so -#LoadModule echo_module modules/mod_echo.so -#LoadModule example_hooks_module modules/mod_example_hooks.so -#LoadModule case_filter_module modules/mod_case_filter.so -#LoadModule case_filter_in_module modules/mod_case_filter_in.so -#LoadModule example_ipc_module modules/mod_example_ipc.so -#LoadModule buffer_module modules/mod_buffer.so -#LoadModule data_module modules/mod_data.so -#LoadModule ratelimit_module modules/mod_ratelimit.so LoadModule reqtimeout_module modules/mod_reqtimeout.so #LoadModule ext_filter_module modules/mod_ext_filter.so #LoadModule request_module modules/mod_request.so #LoadModule include_module modules/mod_include.so LoadModule filter_module modules/mod_filter.so -#LoadModule reflector_module modules/mod_reflector.so -#LoadModule substitute_module modules/mod_substitute.so -#LoadModule sed_module modules/mod_sed.so -#LoadModule charset_lite_module modules/mod_charset_lite.so -#LoadModule deflate_module modules/mod_deflate.so -#LoadModule xml2enc_module modules/mod_xml2enc.so -#LoadModule proxy_html_module modules/mod_proxy_html.so -#LoadModule brotli_module modules/mod_brotli.so LoadModule mime_module modules/mod_mime.so #LoadModule ldap_module modules/mod_ldap.so LoadModule log_config_module modules/mod_log_config.so -#LoadModule log_debug_module modules/mod_log_debug.so -#LoadModule log_forensic_module modules/mod_log_forensic.so -#LoadModule logio_module modules/mod_logio.so -#LoadModule lua_module modules/mod_lua.so LoadModule env_module modules/mod_env.so #LoadModule mime_magic_module modules/mod_mime_magic.so #LoadModule cern_meta_module modules/mod_cern_meta.so @@ -148,29 +51,7 @@ LoadModule proxy_http_module modules/mod_proxy_http.so #LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so #LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so -#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so -#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so -#LoadModule proxy_express_module modules/mod_proxy_express.so -#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so -#LoadModule session_module modules/mod_session.so -#LoadModule session_cookie_module modules/mod_session_cookie.so -#LoadModule session_crypto_module modules/mod_session_crypto.so -#LoadModule session_dbd_module modules/mod_session_dbd.so -#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so -#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so LoadModule ssl_module modules/mod_ssl.so -#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so -#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so -#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so -#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so -#LoadModule dialup_module modules/mod_dialup.so -#LoadModule http2_module modules/mod_http2.so -#LoadModule proxy_http2_module modules/mod_proxy_http2.so -#LoadModule md_module modules/mod_md.so -#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so -#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so -#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so -#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so LoadModule unixd_module modules/mod_unixd.so #LoadModule heartbeat_module modules/mod_heartbeat.so #LoadModule heartmonitor_module modules/mod_heartmonitor.so @@ -186,10 +67,6 @@ LoadModule autoindex_module modules/mod_autoindex.so #LoadModule cgi_module modules/mod_cgi.so -#LoadModule dav_fs_module modules/mod_dav_fs.so -#LoadModule dav_lock_module modules/mod_dav_lock.so -#LoadModule vhost_alias_module modules/mod_vhost_alias.so -#LoadModule negotiation_module modules/mod_negotiation.so LoadModule dir_module modules/mod_dir.so #LoadModule imagemap_module modules/mod_imagemap.so #LoadModule actions_module modules/mod_actions.so @@ -198,24 +75,6 @@ LoadModule dir_module modules/mod_dir.so LoadModule alias_module modules/mod_alias.so LoadModule rewrite_module modules/mod_rewrite.so - - - RewriteEngine On - - # Exclude specific paths from rewriting if needed - RewriteCond %{REQUEST_URI} ^/openmina-node/ [NC,OR] - RewriteCond %{REQUEST_URI} ^/mina/webrtc/signal [NC] - RewriteRule ^ - [L] - - # If an existing asset or directory is requested go to it as it is - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR] - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d - RewriteRule ^ - [L] - - # If the requested resource doesn't exist, use index.html - RewriteRule ^ /index.html - - SSLProxyEngine On @@ -230,150 +89,69 @@ SSLProxyEngine On -# Cache rules - -# REMOVE CACHE - - ExpiresActive On - - # Cache images for one week - ExpiresByType image/jpeg "access plus 1 week" - ExpiresByType image/jpg "access plus 1 week" - ExpiresByType image/svg "access plus 1 week" - ExpiresByType image/png "access plus 1 week" - ExpiresByType image/gif "access plus 1 week" - ExpiresByType image/webp "access plus 1 week" - ExpiresByType image/svg+xml "access plus 1 week" - - - - Header unset ETag - Header unset Last-Modified - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Pragma "no-cache" - - - -# Make sure mod_headers is enabled - - LoadModule headers_module modules/mod_headers.so - - -# -# If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. -# -# User/Group: The name (or #number) of the user/group to run httpd as. -# It is usually good practice to create a dedicated user and group for -# running httpd, as with most system services. -# User www-data Group www-data -# 'Main' server configuration -# -# The directives in this section set up the values used by the 'main' -# server, which responds to any requests that aren't handled by a -# definition. These values also provide defaults for -# any containers you may define later in the file. -# -# All of these directives may appear inside containers, -# in which case these default settings will be overridden for the -# virtual host being defined. -# - -# -# ServerAdmin: Your address, where problems with the server should be -# e-mailed. This address appears on some server-generated pages, such -# as error documents. e.g. admin@your-domain.com -# +# send issue emails to ServerAdmin you@example.com -# -# ServerName gives the name and port that the server uses to identify itself. -# This can often be determined automatically, but we recommend you specify -# it explicitly to prevent problems during startup. -# -# If your host doesn't have a registered DNS name, enter its IP address here. -# -#ServerName www.example.com:80 - -# # Deny access to the entirety of your server's filesystem. You must # explicitly permit access to web content directories in other # blocks below. -# AllowOverride none Require all denied -# -# Note that from this point forward you must specifically allow -# particular features to be enabled - so if something's not working as -# you might expect, make sure that you have specifically enabled it -# below. -# - -# -# DocumentRoot: The directory out of which you will serve your -# documents. By default, all requests are taken from this directory, but -# symbolic links and aliases may be used to point to other locations. -# DocumentRoot "/usr/local/apache2/htdocs" - # - # Possible values for the Options directive are "None", "All", - # or any combination of: - # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews - # - # Note that "MultiViews" must be named *explicitly* --- "Options All" - # doesn't give it to you. - # - # The Options directive is both complicated and important. Please see - # http://httpd.apache.org/docs/2.4/mod/core.html#options - # for more information. - # Options Indexes FollowSymLinks - - # - # AllowOverride controls what directives may be placed in .htaccess files. - # It can be "All", "None", or any combination of the keywords: - # AllowOverride FileInfo AuthConfig Limit - # - AllowOverride None - - # - # Controls who can get stuff from this server. - # + AllowOverride All Require all granted + DirectoryIndex index.html + DirectorySlash On -# -# DirectoryIndex: sets the file that Apache will serve if a directory -# is requested. -# DirectoryIndex index.html -# + + + + RewriteEngine On + + # Exclude specific paths from rewriting if needed + RewriteCond %{REQUEST_URI} ^/openmina-node/ [NC,OR] + RewriteCond %{REQUEST_URI} ^/mina/webrtc/signal [NC] + RewriteRule ^ - [L] + + # Serve correct MIME type for hashed JS files + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^(.+)\.([0-9a-f]+)\.js$ $1.js [L] + + # Your existing Angular routing rules + RewriteRule ^index\.html$ - [L] + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /index.html [L] + + + AddType application/javascript .js + # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. -# Require all denied -# # ErrorLog: The location of the error log file. # If you do not specify an ErrorLog directive within a # container, error messages relating to that virtual host will be # logged here. If you *do* define an error logfile for a # container, that host's errors will be logged there and not here. -# ErrorLog /proc/self/fd/2 # @@ -418,32 +196,6 @@ LogLevel warn - # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client - # will make a new request for the document at its new location. - # Example: - # Redirect permanent /foo http://www.example.com/bar - - # - # Alias: Maps web paths into filesystem paths and is used to - # access content that does not live under the DocumentRoot. - # Example: - # Alias /webpath /full/filesystem/path - # - # If you include a trailing / on /webpath then the server will - # require it to be present in the URL. You will also likely - # need to provide a section to allow access to - # the filesystem path. - - # - # ScriptAlias: This controls which directories contain server scripts. - # ScriptAliases are essentially the same as Aliases, except that - # documents in the target directory are treated as applications and - # run by the server when requested rather than as documents sent to the - # client. The same rules about trailing "/" apply to ScriptAlias - # directives as to Alias. - # ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/" @@ -456,10 +208,8 @@ LogLevel warn #Scriptsock cgisock -# # "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. -# AllowOverride None Options None @@ -467,62 +217,18 @@ LogLevel warn - # # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied # backend servers which have lingering "httpoxy" defects. # 'Proxy' request header is undefined by the IETF, not listed by IANA - # RequestHeader unset Proxy early - # # TypesConfig points to the file containing the list of mappings from # filename extension to MIME-type. - # TypesConfig conf/mime.types - # - # AddType allows you to add to or override the MIME configuration - # file specified in TypesConfig for specific file types. - # - #AddType application/x-gzip .tgz - # - # AddEncoding allows you to have certain browsers uncompress - # information on the fly. Note: Not all browsers support this. - # - #AddEncoding x-compress .Z - #AddEncoding x-gzip .gz .tgz - # - # If the AddEncoding directives above are commented-out, then you - # probably should define those extensions to indicate media types: - # - AddType application/x-compress .Z - AddType application/x-gzip .gz .tgz - AddType application/wasm .wasm AddType application/javascript .js - AddType text/javascript .js - # - # AddHandler allows you to map certain file extensions to "handlers": - # actions unrelated to filetype. These can be either built into the server - # or added with the Action directive (see below) - # - # To use CGI scripts outside of ScriptAliased directories: - # (You will also need to add "ExecCGI" to the "Options" directive.) - # - #AddHandler cgi-script .cgi - - # For type maps (negotiated resources): - #AddHandler type-map var - - # - # Filters allow you to process content before it is sent to the client. - # - # To parse .shtml files for server-side includes (SSI): - # (You will also need to add "Includes" to the "Options" directive.) - # - #AddType text/html .shtml - #AddOutputFilter INCLUDES .shtml # Specific handling for webnode JS files @@ -542,81 +248,17 @@ LogLevel warn Header set Access-Control-Allow-Methods "GET, OPTIONS" -# -# The mod_mime_magic module allows the server to use various hints from the -# contents of the file itself to determine its type. The MIMEMagicFile -# directive tells the module where the hint definitions are located. -# -#MIMEMagicFile conf/magic - -# -# Customizable error responses come in three flavors: -# 1) plain text 2) local redirects 3) external redirects -# -# Some examples: -#ErrorDocument 500 "The server made a boo boo." -#ErrorDocument 404 /missing.html -#ErrorDocument 404 "/cgi-bin/missing_handler.pl" -#ErrorDocument 402 http://www.example.com/subscription_info.html -# - -# -# MaxRanges: Maximum number of Ranges in a request before -# returning the entire resource, or one of the special -# values 'default', 'none' or 'unlimited'. -# Default setting is to accept 200 Ranges. -#MaxRanges unlimited - -# -# EnableMMAP and EnableSendfile: On systems that support it, -# memory-mapping or the sendfile syscall may be used to deliver -# files. This usually improves server performance, but must -# be turned off when serving from networked-mounted -# filesystems or if support for these functions is otherwise -# broken on your system. -# Defaults: EnableMMAP On, EnableSendfile Off -# -#EnableMMAP off -#EnableSendfile on - -# Supplemental configuration -# -# The configuration files in the conf/extra/ directory can be -# included to add extra features or to modify the default configuration of -# the server, or you may simply copy their contents here and change as -# necessary. - -# Server-pool management (MPM specific) -#Include conf/extra/httpd-mpm.conf - -# Multi-language error messages -#Include conf/extra/httpd-multilang-errordoc.conf - -# Fancy directory listings -#Include conf/extra/httpd-autoindex.conf - -# Language settings -#Include conf/extra/httpd-languages.conf - -# User home directories -#Include conf/extra/httpd-userdir.conf - -# Real-time info on requests and configuration -#Include conf/extra/httpd-info.conf - -# Virtual hosts -#Include conf/extra/httpd-vhosts.conf - -# Local access to the Apache HTTP Server Manual -#Include conf/extra/httpd-manual.conf - -# Distributed authoring and versioning (WebDAV) -#Include conf/extra/httpd-dav.conf +# Map all SPA-looking routes to our single page app index file + + FallbackResource /index.html + -# Various default settings -#Include conf/extra/httpd-default.conf +# Requests for files should return a real 404 and not fallback to the index.html page, though + + FallbackResource disabled + ErrorDocument 404 "File not found" + -# Configure mod_proxy_html to understand HTML4/XHTML1 Include conf/extra/proxy-html.conf diff --git a/frontend/package.json b/frontend/package.json index 269d361c14..53028969a6 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,7 +11,7 @@ "tests": "npx cypress open --config baseUrl=http://localhost:4200", "tests:headless": "npx cypress run --headless --config baseUrl=http://localhost:4200", "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t openmina/frontend:latest . && docker push openmina/frontend:latest", - "start:bundle": "npx http-server dist/frontend -p 4200", + "start:bundle": "serve dist/frontend/browser -s -l 4200", "prebuild": "node scripts/update-frontend-version.js", "dev:ssr": "ng run frontend:serve-ssr", "serve:ssr": "node dist/frontend/server/main.js", @@ -86,4 +86,4 @@ "webpack": "^5.88.2", "webpack-bundle-analyzer": "^4.9.0" } -} \ No newline at end of file +} diff --git a/frontend/src/index.html b/frontend/src/index.html index e2887718bd..528473d5e0 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -2,15 +2,6 @@ - - - - - - Open Mina + @@ -59,8 +54,8 @@ deviceOS: 'macOS', deviceOSVersion: '23.5.0', version: '1.0.21', -}; -window.deployment = deployment; + }; + window.deployment = deployment; From b7d2556d717a464cb395b0c6918d37412eb79053 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Wed, 4 Dec 2024 23:45:25 +0400 Subject: [PATCH 169/175] fix(p2p/webrtc): failed connections leaking --- node/src/action_kind.rs | 4 +++- .../connection/incoming/p2p_connection_incoming_reducer.rs | 1 + .../connection/outgoing/p2p_connection_outgoing_reducer.rs | 3 +++ p2p/src/disconnection/p2p_disconnection_actions.rs | 7 +++++++ p2p/src/disconnection/p2p_disconnection_reducer.rs | 5 +++++ .../p2p_disconnection_effectful_actions.rs | 2 +- 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 02c2ae2237..1cea0afb15 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -339,6 +339,7 @@ pub enum ActionKind { P2pConnectionOutgoingEffectfulInit, P2pConnectionOutgoingEffectfulOfferSend, P2pConnectionOutgoingEffectfulRandomInit, + P2pDisconnectionFailedCleanup, P2pDisconnectionFinish, P2pDisconnectionInit, P2pDisconnectionPeerClosed, @@ -704,7 +705,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 594; + pub const COUNT: u16 = 595; } impl std::fmt::Display for ActionKind { @@ -1213,6 +1214,7 @@ impl ActionKindGet for P2pDisconnectionAction { match self { Self::Init { .. } => ActionKind::P2pDisconnectionInit, Self::PeerClosed { .. } => ActionKind::P2pDisconnectionPeerClosed, + Self::FailedCleanup { .. } => ActionKind::P2pDisconnectionFailedCleanup, Self::Finish { .. } => ActionKind::P2pDisconnectionFinish, } } diff --git a/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs b/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs index 0b227ee79e..aa30217363 100644 --- a/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs +++ b/p2p/src/connection/incoming/p2p_connection_incoming_reducer.rs @@ -363,6 +363,7 @@ impl P2pConnectionIncomingState { dispatcher.push_callback(callback.clone(), (rpc_id, str_error)); } } + dispatcher.push(P2pDisconnectionAction::FailedCleanup { peer_id }); Ok(()) } diff --git a/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs b/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs index fba82b98f3..05ffc40c0a 100644 --- a/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs +++ b/p2p/src/connection/outgoing/p2p_connection_outgoing_reducer.rs @@ -9,6 +9,7 @@ use crate::{ outgoing_effectful::P2pConnectionOutgoingEffectfulAction, P2pConnectionErrorResponse, P2pConnectionState, }, + disconnection::P2pDisconnectionAction, webrtc::Host, P2pNetworkKadRequestAction, P2pNetworkSchedulerAction, P2pPeerAction, P2pPeerState, P2pPeerStatus, P2pState, @@ -535,6 +536,8 @@ impl P2pConnectionOutgoingState { dispatcher.push_callback(callback.clone(), (rpc_id, error)); } } + dispatcher.push(P2pDisconnectionAction::FailedCleanup { peer_id }); + Ok(()) } P2pConnectionOutgoingAction::Success { peer_id } => { diff --git a/p2p/src/disconnection/p2p_disconnection_actions.rs b/p2p/src/disconnection/p2p_disconnection_actions.rs index 19874939e3..86946f62b2 100644 --- a/p2p/src/disconnection/p2p_disconnection_actions.rs +++ b/p2p/src/disconnection/p2p_disconnection_actions.rs @@ -18,6 +18,8 @@ pub enum P2pDisconnectionAction { /// Peer disconnection. #[action_event(fields(display(peer_id)), level = info)] PeerClosed { peer_id: PeerId }, + #[action_event(fields(display(peer_id)), level = info)] + FailedCleanup { peer_id: PeerId }, /// Finish disconnecting from a peer. #[action_event(fields(display(peer_id)), level = debug)] Finish { peer_id: PeerId }, @@ -31,8 +33,13 @@ impl redux::EnablingCondition for P2pDisconnectionAction { | P2pDisconnectionAction::Finish { peer_id } => { state.peers.get(peer_id).map_or(false, |peer| { !matches!(peer.status, P2pPeerStatus::Disconnected { .. }) + && !peer.status.is_error() }) } + P2pDisconnectionAction::FailedCleanup { peer_id } => state + .peers + .get(peer_id) + .map_or(false, |peer| !peer.is_libp2p() && peer.status.is_error()), } } } diff --git a/p2p/src/disconnection/p2p_disconnection_reducer.rs b/p2p/src/disconnection/p2p_disconnection_reducer.rs index aa43664c27..517aa5d9ff 100644 --- a/p2p/src/disconnection/p2p_disconnection_reducer.rs +++ b/p2p/src/disconnection/p2p_disconnection_reducer.rs @@ -60,6 +60,11 @@ impl P2pDisconnectedState { dispatcher.push(P2pDisconnectionEffectfulAction::Init { peer_id }); Ok(()) } + P2pDisconnectionAction::FailedCleanup { peer_id } => { + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(P2pDisconnectionEffectfulAction::Init { peer_id }); + Ok(()) + } P2pDisconnectionAction::Finish { peer_id } => { let Some(peer) = p2p_state.peers.get_mut(&peer_id) else { bug_condition!("Invalid state for: `P2pDisconnectionAction::Finish`"); diff --git a/p2p/src/disconnection_effectful/p2p_disconnection_effectful_actions.rs b/p2p/src/disconnection_effectful/p2p_disconnection_effectful_actions.rs index 205aca2bea..5bd7a1e550 100644 --- a/p2p/src/disconnection_effectful/p2p_disconnection_effectful_actions.rs +++ b/p2p/src/disconnection_effectful/p2p_disconnection_effectful_actions.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{P2pPeerStatus, P2pState, PeerId}; #[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] -#[action_event(fields(display(peer_id), display(reason)), level = debug)] +#[action_event(fields(display(peer_id)), level = debug)] pub enum P2pDisconnectionEffectfulAction { /// Initialize disconnection. Init { peer_id: PeerId }, From a4c1bb7e213697c35c2c9211d9a93822aa5c2bd8 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 4 Dec 2024 17:00:47 -0300 Subject: [PATCH 170/175] feat: Add extra logging to the block producer results --- .../block_producer_effectful_effects.rs | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/node/src/block_producer_effectful/block_producer_effectful_effects.rs b/node/src/block_producer_effectful/block_producer_effectful_effects.rs index d2e368ce78..ab7a5cdd3f 100644 --- a/node/src/block_producer_effectful/block_producer_effectful_effects.rs +++ b/node/src/block_producer_effectful/block_producer_effectful_effects.rs @@ -102,12 +102,33 @@ pub fn block_producer_effects( BlockProducerEffectfulAction::BlockUnprovenBuild => { if let Some(stats) = store.service.stats() { let bp = &store.state.get().block_producer; - if let Some((block_hash, block)) = bp.with(None, |bp| match &bp.current { - BlockProducerCurrentState::BlockUnprovenBuilt { - block, block_hash, .. - } => Some((block_hash, block)), - _ => None, - }) { + if let Some((block_hash, block, just_emitted_ledger_proof)) = + bp.with(None, |bp| match &bp.current { + BlockProducerCurrentState::BlockUnprovenBuilt { + block, + block_hash, + emitted_ledger_proof, + .. + } => Some((block_hash, block, emitted_ledger_proof.is_some())), + _ => None, + }) + { + let ps = &block.protocol_state; + let cs = &ps.body.consensus_state; + let previous_state_hash = ps.previous_state_hash.to_string(); + let state_hash = block_hash.to_string(); + let global_slot_since_genesis = cs.global_slot_since_genesis.as_u32(); + let height = cs.blockchain_length.as_u32(); + openmina_core::info!( + meta.time(); + message = "Unproven block built", + state_hash = state_hash, + previous_state_hash = previous_state_hash, + global_slot_since_genesis = global_slot_since_genesis, + height = height, + just_emitted_ledger_proof = just_emitted_ledger_proof, + ); + stats .block_producer() .produced(meta.time(), block_hash, block); From 190491acc396c4aeaf58f81767f993851e114019 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Tue, 3 Dec 2024 08:53:05 -0300 Subject: [PATCH 171/175] tweak: Fix CHANGELOG version links --- CHANGELOG.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cb675141a..b8753643e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -306,23 +306,23 @@ First public release. - Web-based frontend for the node. [Unreleased]: https://github.com/openmina/openmina/compare/v0.11.0...develop -[0.11.0]: https://github.com/openmina/openmina/releases/tag/v0.10.3...v0.11.0 -[0.10.3]: https://github.com/openmina/openmina/releases/tag/v0.10.0...v0.10.3 -[0.10.0]: https://github.com/openmina/openmina/releases/tag/v0.9.0...v0.10.0 -[0.9.0]: https://github.com/openmina/openmina/releases/tag/v0.8.14...v0.9.0 -[0.8.14]: https://github.com/openmina/openmina/releases/tag/v0.8.13...v0.8.14 -[0.8.13]: https://github.com/openmina/openmina/releases/tag/v0.8.3...v0.8.13 -[0.8.3]: https://github.com/openmina/openmina/releases/tag/v0.8.2...v0.8.3 -[0.8.2]: https://github.com/openmina/openmina/releases/tag/v0.8.1...v0.8.2 -[0.8.1]: https://github.com/openmina/openmina/releases/tag/v0.8.0...v0.8.1 -[0.8.0]: https://github.com/openmina/openmina/releases/tag/v0.7.0...v0.8.0 -[0.7.0]: https://github.com/openmina/openmina/releases/tag/v0.6.0...v0.7.0 -[0.6.0]: https://github.com/openmina/openmina/releases/tag/v0.5.1...v0.6.0 -[0.5.1]: https://github.com/openmina/openmina/releases/tag/v0.5.0...v0.5.1 -[0.5.0]: https://github.com/openmina/openmina/releases/tag/v0.4.0...v0.5.0 -[0.4.0]: https://github.com/openmina/openmina/releases/tag/v0.3.0...v0.4.0 -[0.3.1]: https://github.com/openmina/openmina/releases/tag/v0.3.0...v0.3.1 -[0.3.0]: https://github.com/openmina/openmina/releases/tag/v0.2.0...v0.3.0 -[0.2.0]: https://github.com/openmina/openmina/releases/tag/v0.1.0...v0.2.0 -[0.1.0]: https://github.com/openmina/openmina/releases/tag/v0.0.1...v0.1.0 +[0.11.0]: https://github.com/openmina/openmina/compare/v0.10.3...v0.11.0 +[0.10.3]: https://github.com/openmina/openmina/compare/v0.10.0...v0.10.3 +[0.10.0]: https://github.com/openmina/openmina/compare/v0.9.0...v0.10.0 +[0.9.0]: https://github.com/openmina/openmina/compare/v0.8.14...v0.9.0 +[0.8.14]: https://github.com/openmina/openmina/compare/v0.8.13...v0.8.14 +[0.8.13]: https://github.com/openmina/openmina/compare/v0.8.3...v0.8.13 +[0.8.3]: https://github.com/openmina/openmina/compare/v0.8.2...v0.8.3 +[0.8.2]: https://github.com/openmina/openmina/compare/v0.8.1...v0.8.2 +[0.8.1]: https://github.com/openmina/openmina/compare/v0.8.0...v0.8.1 +[0.8.0]: https://github.com/openmina/openmina/compare/v0.7.0...v0.8.0 +[0.7.0]: https://github.com/openmina/openmina/compare/v0.6.0...v0.7.0 +[0.6.0]: https://github.com/openmina/openmina/compare/v0.5.1...v0.6.0 +[0.5.1]: https://github.com/openmina/openmina/compare/v0.5.0...v0.5.1 +[0.5.0]: https://github.com/openmina/openmina/compare/v0.4.0...v0.5.0 +[0.4.0]: https://github.com/openmina/openmina/compare/v0.3.0...v0.4.0 +[0.3.1]: https://github.com/openmina/openmina/compare/v0.3.0...v0.3.1 +[0.3.0]: https://github.com/openmina/openmina/compare/v0.2.0...v0.3.0 +[0.2.0]: https://github.com/openmina/openmina/compare/v0.1.0...v0.2.0 +[0.1.0]: https://github.com/openmina/openmina/compare/v0.0.1...v0.1.0 [0.0.1]: https://github.com/openmina/openmina/releases/tag/v0.0.1 From 7c039f646daf29adc04cdd6ddea20a7fbcb87d9c Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 4 Dec 2024 13:17:34 -0300 Subject: [PATCH 172/175] chore: Update CHANGELOG --- CHANGELOG.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8753643e7..6ff4a9cf2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.12.0] - 2024-12-04 + +### Fixed + +- Properly handle time in cases in which the system goes to sleep. +- Various corner cases in block proof production. +- Improved ledgers sync during bootstrap (be smarter about which peers to query). +- **P2P**: More efficient memory usage when managing the p2p state. +- **P2P**: Lower outgoing traffic by being more conservative about what is broadcasted to each peer. +- **P2P**: Better handling of disconnections. +- **VRF**: Correctly handle cases in which the delegator table is empty. +- **Webnode**: Peer connection handling improvements. + +### Changed + +- **Webnode**: Reduced startup time by loading prover indexes in parallel to the bootstrap process. +- **Webnode**: Faster field operations (faster hashing and proving). +- Improved hashing performance by caching and reusing common prefixes. +- Added more pre-validation checks for blocks received from the network. + +### Added + +- **Webnode**: Transaction propagation +- **P2P**: Support for specifying the external ip to be advertised. + ## [0.11.0] - 2024-10-31 ### Added @@ -305,7 +330,8 @@ First public release. - Alpha version of the node which can connect and syncup to the berkeleynet network, and keep applying new blocks to maintain consensus state and ledger up to date. - Web-based frontend for the node. -[Unreleased]: https://github.com/openmina/openmina/compare/v0.11.0...develop +[Unreleased]: https://github.com/openmina/openmina/compare/v0.12.0...develop +[0.12.0]: https://github.com/openmina/openmina/compare/v0.11.0...v0.12.0 [0.11.0]: https://github.com/openmina/openmina/compare/v0.10.3...v0.11.0 [0.10.3]: https://github.com/openmina/openmina/compare/v0.10.0...v0.10.3 [0.10.0]: https://github.com/openmina/openmina/compare/v0.9.0...v0.10.0 From e231338dba189f8d9763d1a5f93ccb56d2a1faf7 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 4 Dec 2024 17:42:46 -0300 Subject: [PATCH 173/175] Make versions.sh script work on macOS too --- versions.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/versions.sh b/versions.sh index 16754b0d88..d8de6fcd54 100755 --- a/versions.sh +++ b/versions.sh @@ -9,24 +9,26 @@ fi VERSION=$1 version_prefix="version = " -echo "Settting version to: '$VERSION'" +echo "Setting version to: '$VERSION'" for file in "${FILES[@]}" do # This version is handled manually if [ "$file" = "./mina-p2p-messages/Cargo.toml" ]; then continue fi - old_version=`cat $file | grep ^"$version_prefix"` + old_version=$(grep -m 1 ^"$version_prefix" "$file") if [ -z "$old_version" ]; then continue fi new_version="version = \"$VERSION\"" + sed -i '' "s/^$old_version/$new_version/g" "$file" + + version_after=$(grep ^version "$file" | tr -d "$version_prefix") + version_before="${old_version/#$version_prefix}" - # replace version - sed -i "s/^$old_version/$new_version/g" $file - version_after=`cat $file | grep ^version | tr --delete "$version_prefix"` + version_before="${version_before//\"}" echo "$file $version_before -> $version_after" done From d15842049277a17979527117c8bec9c1649e92ca Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 4 Dec 2024 17:43:14 -0300 Subject: [PATCH 174/175] chore: Bump version to 0.12.0 --- Cargo.lock | 54 +++++++++++++-------------- cli/Cargo.toml | 2 +- cli/replay_dynamic_effects/Cargo.toml | 2 +- core/Cargo.toml | 2 +- fuzzer/Cargo.toml | 2 +- ledger/Cargo.toml | 2 +- macros/Cargo.toml | 2 +- node/Cargo.toml | 2 +- node/account/Cargo.toml | 2 +- node/common/Cargo.toml | 2 +- node/invariants/Cargo.toml | 2 +- node/native/Cargo.toml | 2 +- node/testing/Cargo.toml | 2 +- node/web/Cargo.toml | 2 +- p2p/Cargo.toml | 2 +- p2p/libp2p-rpc-behaviour/Cargo.toml | 2 +- p2p/testing/Cargo.toml | 2 +- poseidon/Cargo.toml | 2 +- producer-dashboard/Cargo.toml | 2 +- snark/Cargo.toml | 2 +- tools/bootstrap-sandbox/Cargo.toml | 2 +- tools/fuzzing/Cargo.toml | 2 +- tools/gossipsub-sandbox/Cargo.toml | 2 +- tools/hash-tool/Cargo.toml | 2 +- tools/ledger-tool/Cargo.toml | 2 +- tools/salsa-simple/Cargo.toml | 2 +- tools/transport/Cargo.toml | 2 +- vrf/Cargo.toml | 2 +- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f671a40ce4..a8bb229c4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1042,7 +1042,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cli" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "bytes", @@ -2421,7 +2421,7 @@ dependencies = [ [[package]] name = "hash-tool" -version = "0.11.0" +version = "0.12.0" dependencies = [ "bs58 0.5.0", "hex", @@ -3115,7 +3115,7 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "ledger-tool" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "mina-curves", @@ -3441,7 +3441,7 @@ dependencies = [ [[package]] name = "libp2p-rpc-behaviour" -version = "0.11.0" +version = "0.12.0" dependencies = [ "libp2p", "log", @@ -3826,7 +3826,7 @@ dependencies = [ [[package]] name = "mina-transport" -version = "0.11.0" +version = "0.12.0" dependencies = [ "blake2", "hex", @@ -3837,7 +3837,7 @@ dependencies = [ [[package]] name = "mina-tree" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "ark-ec", @@ -4177,7 +4177,7 @@ dependencies = [ [[package]] name = "node" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "ark-ff", @@ -4536,7 +4536,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openmina-bootstrap-sandbox" -version = "0.11.0" +version = "0.12.0" dependencies = [ "base64 0.21.7", "binprot", @@ -4561,7 +4561,7 @@ dependencies = [ [[package]] name = "openmina-core" -version = "0.11.0" +version = "0.12.0" dependencies = [ "argon2", "ark-ff", @@ -4598,7 +4598,7 @@ dependencies = [ [[package]] name = "openmina-fuzzer" -version = "0.11.0" +version = "0.12.0" dependencies = [ "lazy_static", "rand", @@ -4609,7 +4609,7 @@ dependencies = [ [[package]] name = "openmina-gossipsub-sandbox" -version = "0.11.0" +version = "0.12.0" dependencies = [ "bs58 0.5.0", "env_logger", @@ -4623,7 +4623,7 @@ dependencies = [ [[package]] name = "openmina-macros" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "openmina-core", @@ -4636,7 +4636,7 @@ dependencies = [ [[package]] name = "openmina-node-account" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "bs58 0.4.0", @@ -4654,7 +4654,7 @@ dependencies = [ [[package]] name = "openmina-node-common" -version = "0.11.0" +version = "0.12.0" dependencies = [ "ark-ff", "gloo-timers", @@ -4685,7 +4685,7 @@ dependencies = [ [[package]] name = "openmina-node-invariants" -version = "0.11.0" +version = "0.12.0" dependencies = [ "documented", "lazy_static", @@ -4699,7 +4699,7 @@ dependencies = [ [[package]] name = "openmina-node-native" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "bs58 0.4.0", @@ -4736,7 +4736,7 @@ dependencies = [ [[package]] name = "openmina-node-testing" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "axum", @@ -4782,7 +4782,7 @@ dependencies = [ [[package]] name = "openmina-node-web" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "bytes", @@ -4809,7 +4809,7 @@ dependencies = [ [[package]] name = "openmina-producer-dashboard" -version = "0.11.0" +version = "0.12.0" dependencies = [ "bincode", "clap 4.5.20", @@ -4901,7 +4901,7 @@ dependencies = [ [[package]] name = "p2p" -version = "0.11.0" +version = "0.12.0" dependencies = [ "aes-gcm 0.10.3", "anyhow", @@ -4966,7 +4966,7 @@ dependencies = [ [[package]] name = "p2p-testing" -version = "0.11.0" +version = "0.12.0" dependencies = [ "derive_more", "futures", @@ -5362,7 +5362,7 @@ checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "poseidon" -version = "0.1.0" +version = "0.12.0" dependencies = [ "ark-ff", "mina-curves", @@ -5833,7 +5833,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "replay_dynamic_effects" -version = "0.11.0" +version = "0.12.0" dependencies = [ "node", "openmina-node-invariants", @@ -6216,7 +6216,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "salsa-simple" -version = "0.11.0" +version = "0.12.0" dependencies = [ "generic-array", "hex", @@ -6624,7 +6624,7 @@ dependencies = [ [[package]] name = "snark" -version = "0.11.0" +version = "0.12.0" dependencies = [ "ark-ec", "ark-ff", @@ -7524,7 +7524,7 @@ dependencies = [ [[package]] name = "transaction_fuzzer" -version = "0.11.0" +version = "0.12.0" dependencies = [ "ark-ec", "ark-ff", @@ -7892,7 +7892,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrf" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "ark-ec", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 4583f8783e..9acf6026fc 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cli" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/cli/replay_dynamic_effects/Cargo.toml b/cli/replay_dynamic_effects/Cargo.toml index 99df2ad7df..2f9d41f8e3 100644 --- a/cli/replay_dynamic_effects/Cargo.toml +++ b/cli/replay_dynamic_effects/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "replay_dynamic_effects" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index 820ce1370f..7d1af1ad45 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-core" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/fuzzer/Cargo.toml b/fuzzer/Cargo.toml index c7affb9310..1813a10c7b 100644 --- a/fuzzer/Cargo.toml +++ b/fuzzer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-fuzzer" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 6e1a60df2b..78e4fc6168 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mina-tree" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/macros/Cargo.toml b/macros/Cargo.toml index d6120d8ccc..e346c7882e 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-macros" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" authors = [ "Alexander Koptelov " ] diff --git a/node/Cargo.toml b/node/Cargo.toml index 2a4ab62968..63713c16b4 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/node/account/Cargo.toml b/node/account/Cargo.toml index 48da130afd..b5ac1fec04 100644 --- a/node/account/Cargo.toml +++ b/node/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-account" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/node/common/Cargo.toml b/node/common/Cargo.toml index 6383457d3e..e26483f77a 100644 --- a/node/common/Cargo.toml +++ b/node/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-common" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/node/invariants/Cargo.toml b/node/invariants/Cargo.toml index 5f2dd853bd..306e58f1f7 100644 --- a/node/invariants/Cargo.toml +++ b/node/invariants/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-invariants" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/node/native/Cargo.toml b/node/native/Cargo.toml index e43aaf442c..e7e6027881 100644 --- a/node/native/Cargo.toml +++ b/node/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-native" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml index 8f24a5be9a..10412190c8 100644 --- a/node/testing/Cargo.toml +++ b/node/testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-testing" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/node/web/Cargo.toml b/node/web/Cargo.toml index f39bf26015..9427c4ba62 100644 --- a/node/web/Cargo.toml +++ b/node/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-web" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 089d9c2009..c6317ef742 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2p" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/p2p/libp2p-rpc-behaviour/Cargo.toml b/p2p/libp2p-rpc-behaviour/Cargo.toml index ae94d31ed5..f76077210f 100644 --- a/p2p/libp2p-rpc-behaviour/Cargo.toml +++ b/p2p/libp2p-rpc-behaviour/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-rpc-behaviour" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/p2p/testing/Cargo.toml b/p2p/testing/Cargo.toml index 222b2fde67..2cd6fbbe24 100644 --- a/p2p/testing/Cargo.toml +++ b/p2p/testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2p-testing" -version = "0.11.0" +version = "0.12.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/poseidon/Cargo.toml b/poseidon/Cargo.toml index 73729dceb5..152e03f789 100644 --- a/poseidon/Cargo.toml +++ b/poseidon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "poseidon" -version = "0.1.0" +version = "0.12.0" edition = "2021" [lints] diff --git a/producer-dashboard/Cargo.toml b/producer-dashboard/Cargo.toml index 8870214126..fa4906d800 100644 --- a/producer-dashboard/Cargo.toml +++ b/producer-dashboard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-producer-dashboard" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/snark/Cargo.toml b/snark/Cargo.toml index b68db473a9..b6e26fcc1f 100644 --- a/snark/Cargo.toml +++ b/snark/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snark" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" diff --git a/tools/bootstrap-sandbox/Cargo.toml b/tools/bootstrap-sandbox/Cargo.toml index f94115a70e..16d2f59ee1 100644 --- a/tools/bootstrap-sandbox/Cargo.toml +++ b/tools/bootstrap-sandbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-bootstrap-sandbox" -version = "0.11.0" +version = "0.12.0" edition = "2021" [dependencies] diff --git a/tools/fuzzing/Cargo.toml b/tools/fuzzing/Cargo.toml index 8dc8dced7a..937931df41 100644 --- a/tools/fuzzing/Cargo.toml +++ b/tools/fuzzing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "transaction_fuzzer" -version = "0.11.0" +version = "0.12.0" edition = "2021" diff --git a/tools/gossipsub-sandbox/Cargo.toml b/tools/gossipsub-sandbox/Cargo.toml index 92878eed19..efb698ba14 100644 --- a/tools/gossipsub-sandbox/Cargo.toml +++ b/tools/gossipsub-sandbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-gossipsub-sandbox" -version = "0.11.0" +version = "0.12.0" edition = "2021" [dependencies] diff --git a/tools/hash-tool/Cargo.toml b/tools/hash-tool/Cargo.toml index 41145275b3..7a8a438bc8 100644 --- a/tools/hash-tool/Cargo.toml +++ b/tools/hash-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hash-tool" -version = "0.11.0" +version = "0.12.0" edition = "2021" [dependencies] diff --git a/tools/ledger-tool/Cargo.toml b/tools/ledger-tool/Cargo.toml index ad5f8376cb..fa4de99c0e 100644 --- a/tools/ledger-tool/Cargo.toml +++ b/tools/ledger-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ledger-tool" -version = "0.11.0" +version = "0.12.0" edition = "2021" [dependencies] diff --git a/tools/salsa-simple/Cargo.toml b/tools/salsa-simple/Cargo.toml index be6f76562a..22c2458b43 100644 --- a/tools/salsa-simple/Cargo.toml +++ b/tools/salsa-simple/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "salsa-simple" -version = "0.11.0" +version = "0.12.0" edition = "2021" [dev-dependencies] diff --git a/tools/transport/Cargo.toml b/tools/transport/Cargo.toml index 357cbde214..6918f62d38 100644 --- a/tools/transport/Cargo.toml +++ b/tools/transport/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mina-transport" -version = "0.11.0" +version = "0.12.0" edition = "2021" [dependencies] diff --git a/vrf/Cargo.toml b/vrf/Cargo.toml index 0eeb6db075..c07f06fe54 100644 --- a/vrf/Cargo.toml +++ b/vrf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vrf" -version = "0.11.0" +version = "0.12.0" edition = "2021" license = "Apache-2.0" From 05cb43a1219f05ac03cfd5c0661053ae62be48df Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 4 Dec 2024 17:45:20 -0300 Subject: [PATCH 175/175] chore: Update version in docker compose files --- docker-compose.local.producers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.local.producers.yml b/docker-compose.local.producers.yml index 588aee6825..fd57492317 100644 --- a/docker-compose.local.producers.yml +++ b/docker-compose.local.producers.yml @@ -1,7 +1,7 @@ services: local-producer-cluster: container_name: local-producer-cluster - image: openmina/openmina:0.11.0 + image: openmina/openmina:0.12.0 environment: - RUST_BACKTRACE=1 entrypoint: ["openmina-node-testing", "scenarios-generate", "--name", "simulation-small-forever-real-time"] @@ -12,7 +12,7 @@ services: frontend: container_name: frontend - image: openmina/frontend:0.11.0 + image: openmina/frontend:0.12.0 environment: OPENMINA_FRONTEND_ENVIRONMENT: block-producers ports: