logos-blockchain/logos-execution-zone
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-execution-zone.git synced 2026-03-28 21:23:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename timestamp_ms to timestamp

Browse Source
This commit is contained in:
Sergio Chouhy 2026-03-28 03:47:25 -03:00
parent 3b7fe58f6f
commit 3fdf93df4f
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/transaction.rs
View File

@ -70,14 +70,14 @@ impl NSSATransaction {
self,
state: &mut V03State,
block_id: BlockId,
timestamp_ms: Timestamp,
timestamp: Timestamp,
) -> Result<Self, nssa::error::NssaError> {
match &self {
Self::Public(tx) => {
state.transition_from_public_transaction(tx, block_id, timestamp_ms)
state.transition_from_public_transaction(tx, block_id, timestamp)
}
Self::PrivacyPreserving(tx) => {
state.transition_from_privacy_preserving_transaction(tx, block_id, timestamp_ms)
state.transition_from_privacy_preserving_transaction(tx, block_id, timestamp)
}
Self::ProgramDeployment(tx) => state.transition_from_program_deployment_transaction(tx),
}

4
nssa/src/privacy_preserving_transaction/transaction.rs
View File

@ -37,7 +37,7 @@ impl PrivacyPreservingTransaction {
&self,
state: &V03State,
block_id: BlockId,
timestamp_ms: Timestamp,
timestamp: Timestamp,
) -> Result<HashMap<AccountId, Account>, NssaError> {
let message = &self.message;
let witness_set = &self.witness_set;
@ -96,7 +96,7 @@ impl PrivacyPreservingTransaction {
// Verify validity window
if !message.block_validity_window.is_valid_for(block_id)
|| !message.timestamp_validity_window.is_valid_for(timestamp_ms)
|| !message.timestamp_validity_window.is_valid_for(timestamp)
{
return Err(NssaError::OutOfValidityWindow);
}

4
nssa/src/public_transaction/transaction.rs
View File

@ -72,7 +72,7 @@ impl PublicTransaction {
&self,
state: &V03State,
block_id: BlockId,
timestamp_ms: Timestamp,
timestamp: Timestamp,
) -> Result<HashMap<AccountId, Account>, NssaError> {
let message = self.message();
let witness_set = self.witness_set();
@ -196,7 +196,7 @@ impl PublicTransaction {
// Verify validity window
ensure!(
program_output.block_validity_window.is_valid_for(block_id)
&& program_output.timestamp_validity_window.is_valid_for(timestamp_ms),
&& program_output.timestamp_validity_window.is_valid_for(timestamp),
NssaError::OutOfValidityWindow
);

28
nssa/src/state.rs
View File

@ -159,9 +159,9 @@ impl V03State {
&mut self,
tx: &PublicTransaction,
block_id: BlockId,
timestamp_ms: Timestamp,
timestamp: Timestamp,
) -> Result<(), NssaError> {
let state_diff = tx.validate_and_produce_public_state_diff(self, block_id, timestamp_ms)?;
let state_diff = tx.validate_and_produce_public_state_diff(self, block_id, timestamp)?;
#[expect(
clippy::iter_over_hash_type,
@ -185,11 +185,11 @@ impl V03State {
&mut self,
tx: &PrivacyPreservingTransaction,
block_id: BlockId,
timestamp_ms: Timestamp,
timestamp: Timestamp,
) -> Result<(), NssaError> {
// 1. Verify the transaction satisfies acceptance criteria
let public_state_diff =
tx.validate_and_produce_public_state_diff(self, block_id, timestamp_ms)?;
tx.validate_and_produce_public_state_diff(self, block_id, timestamp)?;
let message = tx.message();
@ -3066,7 +3066,7 @@ pub mod tests {
#[test_case::test_case((None, None), 100; "no bounds - always valid 2")]
fn timestamp_validity_window_works_in_public_transactions(
validity_window: (Option<Timestamp>, Option<Timestamp>),
timestamp_ms: Timestamp,
timestamp: Timestamp,
) {
let timestamp_validity_window: TimestampValidityWindow =
validity_window.try_into().unwrap();
@ -3086,12 +3086,12 @@ pub mod tests {
let witness_set = public_transaction::WitnessSet::for_message(&message, &[]);
PublicTransaction::new(message, witness_set)
};
let result = state.transition_from_public_transaction(&tx, 1, timestamp_ms);
let result = state.transition_from_public_transaction(&tx, 1, timestamp);
let is_inside_validity_window =
match (timestamp_validity_window.start(), timestamp_validity_window.end()) {
(Some(s), Some(e)) => s <= timestamp_ms && timestamp_ms < e,
(Some(s), None) => s <= timestamp_ms,
(None, Some(e)) => timestamp_ms < e,
(Some(s), Some(e)) => s <= timestamp && timestamp < e,
(Some(s), None) => s <= timestamp,
(None, Some(e)) => timestamp < e,
(None, None) => true,
};
if is_inside_validity_window {
@ -3181,7 +3181,7 @@ pub mod tests {
#[test_case::test_case((None, None), 100; "no bounds - always valid 2")]
fn timestamp_validity_window_works_in_privacy_preserving_transactions(
validity_window: (Option<Timestamp>, Option<Timestamp>),
timestamp_ms: Timestamp,
timestamp: Timestamp,
) {
let timestamp_validity_window: TimestampValidityWindow =
validity_window.try_into().unwrap();
@ -3218,12 +3218,12 @@ pub mod tests {
let witness_set = WitnessSet::for_message(&message, proof, &[]);
PrivacyPreservingTransaction::new(message, witness_set)
};
let result = state.transition_from_privacy_preserving_transaction(&tx, 1, timestamp_ms);
let result = state.transition_from_privacy_preserving_transaction(&tx, 1, timestamp);
let is_inside_validity_window =
match (timestamp_validity_window.start(), timestamp_validity_window.end()) {
(Some(s), Some(e)) => s <= timestamp_ms && timestamp_ms < e,
(Some(s), None) => s <= timestamp_ms,
(None, Some(e)) => timestamp_ms < e,
(Some(s), Some(e)) => s <= timestamp && timestamp < e,
(Some(s), None) => s <= timestamp,
(None, Some(e)) => timestamp < e,
(None, None) => true,
};
if is_inside_validity_window {