mobilecoinfoundation · nick-mobilecoin · Nov 20, 2023 · Nov 21, 2023 · Nov 21, 2023 · Nov 22, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/blockchain/types/src/block.rs b/blockchain/types/src/block.rs
@@ -147,6 +147,8 @@ impl Block {
         block_contents: &BlockContents,
         timestamp: u64,
     ) -> Self {
+        assert!((timestamp == 0) ^ version.timestamps_are_supported());
+
         let contents_hash = block_contents.hash();
         let id = compute_block_id(
             *version,

diff --git a/consensus/api/proto/consensus_common.proto b/consensus/api/proto/consensus_common.proto
@@ -99,6 +99,7 @@ enum ProposeTxResult {
     InputRuleAmount = 53;
     LedgerTxOutIndexOutOfBounds = 54;
     FeeMapDigestMismatch = 55;
+    Timestamp = 56;
 }
 
 /// Response from TxPropose RPC call.

diff --git a/consensus/api/src/conversions.rs b/consensus/api/src/conversions.rs
@@ -63,6 +63,7 @@ impl From<Error> for ProposeTxResult {
             Error::InputRulesNotAllowed => Self::InputRulesNotAllowed,
             Error::InputRule(ir) => ir.into(),
             Error::UnknownMaskedAmountVersion => Self::UnknownMaskedAmountVersion,
+            Error::Timestamp(_) => Self::Timestamp,
         }
     }
 }

diff --git a/consensus/enclave/api/src/lib.rs b/consensus/enclave/api/src/lib.rs
@@ -222,6 +222,11 @@ pub struct FormBlockInputs {
 
     /// Minting transactions coupled with configuration information.
     pub mint_txs_with_config: Vec<(MintTx, MintConfigTx, MintConfig)>,
+
+    /// The timestamp to use for the block. ms since Unix epoch.
+    /// If timestamps are not supported by the block version this
+    /// value will be ignored and 0 will be used instead.
+    pub timestamp: u64,
 }
 
 /// The API for interacting with a consensus node's enclave.

diff --git a/consensus/enclave/impl/Cargo.toml b/consensus/enclave/impl/Cargo.toml
@@ -53,13 +53,15 @@ rand_core = { version = "0.6", default-features = false }
 subtle = { version = "2.4", default-features = false, features = ["i128"] }
 
 [dev-dependencies]
+assert_matches = "1"
 mc-common = { path = "../../../common", features = ["loggers"] }
 mc-crypto-multisig = { path = "../../../crypto/multisig" }
 mc-ledger-db = { path = "../../../ledger/db", features = ["test_utils"] }
 mc-transaction-core-test-utils = { path = "../../../transaction/core/test-utils" }
 
 rand = "0.8"
 rand_hc = "0.3"
+yare = "2"
 
 [build-dependencies]
 mc-crypto-keys = { path = "../../../crypto/keys" }