Merge branch '2.0' into chain_switching_threshold

iotaledger · Dec 6, 2023 · 4c59eea · 4c59eea
2 parents a5c2d11 + 0738cfc
commit 4c59eea
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 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.

diff --git a/sdk/src/wallet/error.rs b/sdk/src/wallet/error.rs
@@ -127,6 +127,9 @@ pub enum Error {
     /// Implicit account not found.
     #[error("implicit account not found")]
     ImplicitAccountNotFound,
+    /// No account was provided or found to issue the block.
+    #[error("no account was provided or found to issue the block")]
+    NoAccountToIssueBlock,
 }
 
 impl Error {

diff --git a/sdk/src/wallet/operations/block.rs b/sdk/src/wallet/operations/block.rs
@@ -19,8 +19,16 @@ where
     ) -> Result<BlockId> {
         log::debug!("submit_basic_block");
 
-        // TODO https://github.com/iotaledger/iota-sdk/issues/1741
-        let issuer_id = issuer_id.into().unwrap_or(AccountId::null());
+        let issuer_id = match issuer_id.into() {
+            Some(issuer_id) => Some(issuer_id),
+            None => self
+                .data()
+                .await
+                .accounts()
+                .next()
+                .map(|o| o.output.as_account().account_id_non_null(&o.output_id)),
+        }
+        .ok_or(Error::NoAccountToIssueBlock)?;
 
         let block = self
             .client()