Merge branch '2.0' into annual_decay_factor_percentage

iotaledger · Dec 6, 2023 · 45b3629 · 45b3629
2 parents 8598f75 + 0738cfc
commit 45b3629
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/sdk/src/client/api/block_builder/mod.rs b/sdk/src/client/api/block_builder/mod.rs
@@ -19,6 +19,7 @@ impl ClientInner {
     pub async fn build_basic_block(&self, issuer_id: AccountId, payload: Option<Payload>) -> Result<UnsignedBlock> {
         let issuance = self.get_issuance().await?;
 
+        // TODO https://github.com/iotaledger/iota-sdk/issues/1753
         let issuing_time = {
             #[cfg(feature = "std")]
             let issuing_time = std::time::SystemTime::now()

diff --git a/sdk/src/types/api/core.rs b/sdk/src/types/api/core.rs
@@ -277,6 +277,9 @@ pub struct IssuanceBlockHeaderResponse {
     /// Blocks that are directly referenced to adjust opinion.
     #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
     pub shallow_like_parents: BTreeSet<BlockId>,
+    // Latest issuing time of the returned parents.
+    #[serde(with = "string")]
+    pub latest_parent_block_issuing_time: u64,
     /// The slot index of the latest finalized slot.
     pub latest_finalized_slot: SlotIndex,
     /// The latest slot commitment.