chore(timelock): remove environment-based timelock code for mainnet r…

…elease
witnet · Jan 29, 2025 · c7b5bc9 · c7b5bc9
1 parent d009da4
commit c7b5bc9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/data_structures/src/transaction_factory.rs b/data_structures/src/transaction_factory.rs
@@ -8,12 +8,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     chain::{
-        DataRequestOutput, Environment, Epoch, EpochConstants, Input, OutputPointer, PublicKeyHash,
-        StakeOutput, ValueTransferOutput,
+        DataRequestOutput, Epoch, EpochConstants, Input, OutputPointer, PublicKeyHash, StakeOutput,
+        ValueTransferOutput,
     },
     error::TransactionError,
     fee::{AbsoluteFee, Fee},
-    get_environment,
     transaction::{
         DRTransactionBody, StakeTransactionBody, UnstakeTransactionBody, VTTransactionBody,
         INPUT_SIZE,
@@ -681,13 +680,11 @@ pub fn transaction_inputs_sum(
         let (epoch_timestamp, _) = epoch_constants.epoch_timestamp(epoch)?;
         let vt_time_lock = i64::try_from(vt_output.time_lock)?;
         if vt_time_lock > epoch_timestamp {
-            if get_environment() == Environment::Mainnet || epoch > 22_000 {
-                return Err(TransactionError::TimeLock {
-                    expected: vt_time_lock,
-                    current: epoch_timestamp,
-                }
-                .into());
+            return Err(TransactionError::TimeLock {
+                expected: vt_time_lock,
+                current: epoch_timestamp,
             }
+            .into());
         } else {
             if !seen_output_pointers.insert(input.output_pointer()) {
                 // If the set already contained this output pointer

diff --git a/validations/src/validations.rs b/validations/src/validations.rs
@@ -17,17 +17,17 @@ use witnet_data_structures::{
     chain::{
         tapi::ActiveWips, Block, BlockMerkleRoots, CheckpointBeacon, CheckpointVRF,
         ConsensusConstants, ConsensusConstantsWit2, DataRequestOutput, DataRequestStage,
-        DataRequestState, Environment, Epoch, EpochConstants, Hash, Hashable, Input,
-        KeyedSignature, OutputPointer, PublicKeyHash, RADRequest, RADTally, RADType, Reputation,
-        ReputationEngine, SignaturesToVerify, StakeOutput, ValueTransferOutput,
+        DataRequestState, Epoch, EpochConstants, Hash, Hashable, Input, KeyedSignature,
+        OutputPointer, PublicKeyHash, RADRequest, RADTally, RADType, Reputation, ReputationEngine,
+        SignaturesToVerify, StakeOutput, ValueTransferOutput,
     },
     data_request::{
         calculate_reward_collateral_ratio, calculate_tally_change, calculate_witness_reward,
         calculate_witness_reward_before_second_hard_fork, create_tally,
         data_request_has_too_many_witnesses, DataRequestPool,
     },
     error::{BlockError, DataRequestError, TransactionError},
-    get_environment, get_protocol_version, get_protocol_version_activation_epoch,
+    get_protocol_version, get_protocol_version_activation_epoch,
     proto::versioning::{ProtocolVersion, VersionedHashable},
     radon_report::{RadonReport, ReportContext},
     staking::prelude::{Power, QueryStakesKey, StakeKey, StakesTracker},
@@ -1497,11 +1497,8 @@ pub fn validate_unstake_transaction<'a>(
             }
 
             // TODO: modify this to enable delegated staking with multiple withdrawer addresses on a single validator
-            // TODO: remove this check for mainnet release
             let nonce = stake_entry.first().map(|stake| stake.value.nonce).unwrap();
-            if (get_environment() == Environment::Mainnet || epoch > 22_000)
-                && ut_tx.body.nonce != nonce
-            {
+            if ut_tx.body.nonce != nonce {
                 return Err(TransactionError::UnstakeInvalidNonce {
                     used: ut_tx.body.nonce,
                     current: nonce,