Merge branch 'main' into p2p-request-handler

Author: Boog900

.github/labeler.yml

@@ -56,6 +56,10 @@ A-cryptonight:
 - changed-files:
   - any-glob-to-any-file: cryptonight/**
 
+A-constants:
+- changed-files:
+  - any-glob-to-any-file: constants/**
+
 A-storage:
 - changed-files:
   - any-glob-to-any-file: storage/**

Cargo.lock

@@ -3,6 +3,7 @@ resolver = "2"
 
 members = [
 	"binaries/cuprated",
+	"constants",
 	"consensus",
 	"consensus/fast-sync",
 	"consensus/rules",

Cargo.toml

@@ -55,6 +55,7 @@ cargo doc --open --package cuprate-blockchain
 ## 1-off crates
 | Crate | In-tree path | Purpose |
 |-------|--------------|---------|
+| [`cuprate-constants`](https://doc.cuprate.org/cuprate_constants) | [`constants/`](https://github.com/Cuprate/cuprate/tree/main/constants) | Shared `const/static` data across Cuprate
 | [`cuprate-cryptonight`](https://doc.cuprate.org/cuprate_cryptonight) | [`cryptonight/`](https://github.com/Cuprate/cuprate/tree/main/cryptonight) | CryptoNight hash functions
 | [`cuprate-pruning`](https://doc.cuprate.org/cuprate_pruning) | [`pruning/`](https://github.com/Cuprate/cuprate/tree/main/pruning) | Monero pruning logic/types
 | [`cuprate-helper`](https://doc.cuprate.org/cuprate_helper) | [`helper/`](https://github.com/Cuprate/cuprate/tree/main/helper) | Kitchen-sink helper crate for Cuprate

books/architecture/src/appendix/crates.md

@@ -11,6 +11,7 @@ proptest = ["cuprate-types/proptest"]
 rayon = ["dep:rayon"]
 
 [dependencies]
+cuprate-constants = { path = "../../constants", default-features = false }
 cuprate-helper = { path = "../../helper", default-features = false, features = ["std", "cast"] }
 cuprate-types = { path = "../../types", default-features = false }
 cuprate-cryptonight = {path = "../../cryptonight"}

consensus/rules/Cargo.toml

@@ -1,5 +1,6 @@
 use monero_serai::transaction::{Input, Output, Timelock, Transaction};
 
+use cuprate_constants::block::MAX_BLOCK_HEIGHT_USIZE;
 use cuprate_types::TxVersion;
 
 use crate::{is_decomposed_amount, transactions::check_output_types, HardFork};
@@ -112,7 +113,7 @@ const fn check_time_lock(time_lock: &Timelock, chain_height: usize) -> Result<()
         &Timelock::Block(till_height) => {
             // Lock times above this amount are timestamps not blocks.
             // This is just for safety though and shouldn't actually be hit.
-            if till_height > 500_000_000 {
+            if till_height > MAX_BLOCK_HEIGHT_USIZE {
                 return Err(MinerTxError::InvalidLockTime);
             }
             if till_height == chain_height + MINER_TX_TIME_LOCKED_BLOCKS {

consensus/rules/src/miner_tx.rs

@@ -9,6 +9,7 @@ use proptest::{collection::vec, prelude::*};
 
 use monero_serai::transaction::Output;
 
+use cuprate_constants::block::MAX_BLOCK_HEIGHT;
 use cuprate_helper::cast::u64_to_usize;
 
 use super::*;
@@ -160,10 +161,10 @@ prop_compose! {
     /// Returns a [`Timelock`] that is locked given a height and time.
     fn locked_timelock(height: u64, time_for_time_lock: u64)(
         timebased in any::<bool>(),
-        lock_height in (height+1)..500_000_001,
+        lock_height in (height+1)..=MAX_BLOCK_HEIGHT,
         time_for_time_lock in (time_for_time_lock+121)..,
     ) -> Timelock {
-        if timebased || lock_height > 500_000_000 {
+        if timebased || lock_height > MAX_BLOCK_HEIGHT {
             Timelock::Time(time_for_time_lock)
         } else {
             Timelock::Block(u64_to_usize(lock_height))
@@ -240,7 +241,7 @@ proptest! {
     }
 
     #[test]
-    fn test_timestamp_time_lock(timestamp in 500_000_001..u64::MAX) {
+    fn test_timestamp_time_lock(timestamp in MAX_BLOCK_HEIGHT+1..u64::MAX) {
         prop_assert!(check_timestamp_time_lock(timestamp, timestamp - 120, HardFork::V16));
         prop_assert!(!check_timestamp_time_lock(timestamp, timestamp - 121, HardFork::V16));
         prop_assert!(check_timestamp_time_lock(timestamp, timestamp, HardFork::V16));

consensus/rules/src/transactions/tests.rs

@@ -0,0 +1,22 @@
+[package]
+name        = "cuprate-constants"
+version     = "0.1.0"
+edition     = "2021"
+description = "Constant/static data used throughout Cuprate"
+license     = "MIT"
+authors     = ["hinto-janai"]
+repository  = "https://github.com/Cuprate/cuprate/tree/main/constants"
+keywords    = ["cuprate", "constants"]
+
+[features]
+default = []
+block   = []
+build   = []
+rpc     = []
+
+[dependencies]
+
+[dev-dependencies]
+
+[lints]
+workspace = true

constants/Cargo.toml

@@ -0,0 +1,3 @@
+# cuprate-constants
+This crate contains general constants that are not specific to any particular
+part of the codebase yet are used in multiple places such as the maximum block height.

constants/README.md

@@ -1,9 +1,7 @@
 fn main() {
-    #[cfg(feature = "constants")]
     set_commit_env();
 }
 
-#[cfg(feature = "constants")]
 /// This sets the git `COMMIT` environment variable.
 fn set_commit_env() {
     const PATH: &str = "../.git/refs/heads/";