iotaledger · thibault-martinez · Oct 27, 2023 · Oct 18, 2023 · Oct 19, 2023 · Oct 25, 2023
diff --git a/bindings/core/src/method/client.rs b/bindings/core/src/method/client.rs
@@ -8,7 +8,6 @@ use iota_sdk::{
     client::{node_api::indexer::query_parameters::QueryParameter, node_manager::node::NodeAuth},
     types::block::{
         address::{Bech32Address, Hrp},
-        core::basic,
         output::{
             dto::OutputDto, feature::Feature, unlock_condition::dto::UnlockConditionDto, AccountId, FoundryId,
             NativeToken, NftId, OutputId, TokenScheme,
@@ -127,9 +126,6 @@ pub enum ClientMethod {
     BuildBasicBlock {
         /// The issuer's ID.
         issuer_id: IssuerId,
-        /// Optional strong parents for the block.
-        #[serde(default)]
-        strong_parents: Option<basic::StrongParents>,
         /// The block payload.
         #[serde(default)]
         payload: Option<PayloadDto>,

diff --git a/bindings/core/src/method_handler/client.rs b/bindings/core/src/method_handler/client.rs
@@ -161,11 +161,7 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
 
             Response::Output(OutputDto::from(&output))
         }
-        ClientMethod::BuildBasicBlock {
-            issuer_id,
-            strong_parents,
-            payload,
-        } => {
+        ClientMethod::BuildBasicBlock { issuer_id, payload } => {
             let payload = if let Some(payload) = payload {
                 Some(Payload::try_from_dto_with_params(
                     payload,
@@ -175,9 +171,7 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
                 None
             };
             Response::UnsignedBlock(UnsignedBlockDto::from(
-                &client
-                    .build_basic_block(issuer_id, None, strong_parents, payload)
-                    .await?,
+                &client.build_basic_block(issuer_id, payload).await?,
             ))
         }
         #[cfg(feature = "mqtt")]

diff --git a/bindings/core/tests/combined.rs b/bindings/core/tests/combined.rs
@@ -273,7 +273,6 @@ async fn build_and_sign_block() -> Result<()> {
         &client,
         ClientMethod::BuildBasicBlock {
             issuer_id: IssuerId::null(),
-            strong_parents: None,
             payload: Some(payload.clone()),
         },
     )

diff --git a/sdk/examples/client/block/00_block_no_payload.rs b/sdk/examples/client/block/00_block_no_payload.rs
@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
 
     // Create and send the block.
     let block = client
-        .build_basic_block(issuer_id, None, None, None)
+        .build_basic_block(issuer_id, None)
         .await?
         .sign_ed25519(&secret_manager, Bip44::new(IOTA_COIN_TYPE))
         .await?;

diff --git a/sdk/examples/client/block/01_block_confirmation_time.rs b/sdk/examples/client/block/01_block_confirmation_time.rs
@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
 
     // Create and send a block.
     let block = client
-        .build_basic_block(issuer_id, None, None, None)
+        .build_basic_block(issuer_id, None)
         .await?
         .sign_ed25519(&secret_manager, Bip44::new(IOTA_COIN_TYPE))
         .await?;

diff --git a/sdk/examples/client/block/02_block_custom_parents.rs b/sdk/examples/client/block/02_block_custom_parents.rs
@@ -36,8 +36,9 @@ async fn main() -> Result<()> {
     println!("Issuance:\n{issuance:#?}");
 
     // Create and send the block with custom parents.
+    // TODO set Some(issuance.strong_parents()?
     let block = client
-        .build_basic_block(issuer_id, None, Some(issuance.strong_parents()?), None)
+        .build_basic_block(issuer_id, None)
         .await?
         .sign_ed25519(&secret_manager, Bip44::new(IOTA_COIN_TYPE))
         .await?;

diff --git a/sdk/examples/client/block/03_block_custom_payload.rs b/sdk/examples/client/block/03_block_custom_payload.rs
@@ -39,7 +39,7 @@ async fn main() -> Result<()> {
 
     // Create and send the block with the custom payload.
     let block = client
-        .build_basic_block(issuer_id, None, None, Some(Payload::from(tagged_data_payload)))
+        .build_basic_block(issuer_id, Some(Payload::from(tagged_data_payload)))
         .await?
         .sign_ed25519(&secret_manager, Bip44::new(IOTA_COIN_TYPE))
         .await?;

diff --git a/sdk/examples/client/block/04_block_tagged_data.rs b/sdk/examples/client/block/04_block_tagged_data.rs
@@ -38,8 +38,6 @@ async fn main() -> Result<()> {
     let block = client
         .build_basic_block(
             issuer_id,
-            None,
-            None,
             Some(Payload::TaggedData(Box::new(
                 TaggedDataPayload::new(
                     std::env::args()

diff --git a/sdk/examples/client/node_api_core/04_post_block.rs b/sdk/examples/client/node_api_core/04_post_block.rs
@@ -36,7 +36,7 @@ async fn main() -> Result<()> {
 
     // Create the block.
     let block = client
-        .build_basic_block(issuer_id, None, None, None)
+        .build_basic_block(issuer_id, None)
         .await?
         .sign_ed25519(&secret_manager, Bip44::new(IOTA_COIN_TYPE))
         .await?;

diff --git a/sdk/examples/client/node_api_core/05_post_block_raw.rs b/sdk/examples/client/node_api_core/05_post_block_raw.rs
@@ -36,7 +36,7 @@ async fn main() -> Result<()> {
 
     // Create the block.
     let block = client
-        .build_basic_block(issuer_id, None, None, None)
+        .build_basic_block(issuer_id, None)
         .await?
         .sign_ed25519(&secret_manager, Bip44::new(IOTA_COIN_TYPE))
         .await?;

diff --git a/sdk/src/client/api/block_builder/mod.rs b/sdk/src/client/api/block_builder/mod.rs
@@ -8,24 +8,17 @@ pub use self::transaction::verify_semantic;
 use crate::{
     client::{ClientInner, Result},
     types::block::{
-        core::{basic, BlockHeader, UnsignedBlock},
+        core::{BlockHeader, UnsignedBlock},
         payload::Payload,
         Block, IssuerId,
     },
 };
 
 impl ClientInner {
-    pub async fn build_basic_block(
-        &self,
-        issuer_id: IssuerId,
-        issuing_time: Option<u64>,
-        strong_parents: Option<basic::StrongParents>,
-        payload: Option<Payload>,
-    ) -> Result<UnsignedBlock> {
+    pub async fn build_basic_block(&self, issuer_id: IssuerId, payload: Option<Payload>) -> Result<UnsignedBlock> {
         let issuance = self.get_issuance().await?;
-        let strong_parents = strong_parents.unwrap_or(issuance.strong_parents()?);
 
-        let issuing_time = issuing_time.unwrap_or_else(|| {
+        let issuing_time = {
             #[cfg(feature = "std")]
             let issuing_time = std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
@@ -36,7 +29,7 @@ impl ClientInner {
             #[cfg(not(feature = "std"))]
             let issuing_time = 0;
             issuing_time
-        });
+        };
 
         let protocol_params = self.get_protocol_parameters().await?;
 
@@ -49,7 +42,8 @@ impl ClientInner {
                 issuance.latest_finalized_slot,
                 issuer_id,
             ),
-            Block::build_basic(strong_parents, 0) // TODO: burned mana calculation
+            // TODO: burned mana calculation
+            Block::build_basic(issuance.strong_parents()?, 0)
                 .with_weak_parents(issuance.weak_parents()?)
                 .with_shallow_like_parents(issuance.shallow_like_parents()?)
                 .with_payload(payload)

diff --git a/sdk/src/wallet/account/operations/reissue.rs b/sdk/src/wallet/account/operations/reissue.rs
@@ -63,8 +63,6 @@ where
                     .client()
                     .build_basic_block(
                         todo!("issuer id"),
-                        todo!("issuing time"),
-                        None,
                         Some(Payload::SignedTransaction(Box::new(transaction.payload.clone()))),
                     )
                     .await?
@@ -113,8 +111,6 @@ where
                             .client()
                             .build_basic_block(
                                 todo!("issuer id"),
-                                todo!("issuing time"),
-                                None,
                                 Some(Payload::SignedTransaction(Box::new(transaction.payload.clone()))),
                             )
                             .await?

diff --git a/sdk/src/wallet/account/operations/transaction/submit_transaction.rs b/sdk/src/wallet/account/operations/transaction/submit_transaction.rs
@@ -27,12 +27,7 @@ where
 
         let block = self
             .client()
-            .build_basic_block(
-                todo!("issuer id"),
-                todo!("issuing time"),
-                None,
-                Some(Payload::from(transaction_payload)),
-            )
+            .build_basic_block(todo!("issuer id"), Some(Payload::from(transaction_payload)))
             .await?
             .sign_ed25519(
                 &*self.get_secret_manager().read().await,

diff --git a/sdk/tests/client/node_api/mod.rs b/sdk/tests/client/node_api/mod.rs
@@ -36,8 +36,6 @@ async fn setup_tagged_data_block(secret_manager: &SecretManager) -> BlockId {
     client
         .build_basic_block(
             IssuerId::null(),
-            None,
-            None,
             Some(Payload::TaggedData(Box::new(
                 TaggedDataPayload::new(b"Hello".to_vec(), b"Tangle".to_vec()).unwrap(),
             ))),