Merge branch '2.0' into some-docs-changes

bindings/core/src/method/client.rs

@@ -13,7 +13,7 @@ use iota_sdk::{
             NativeToken, NftId, OutputId, TokenScheme,
         },
         payload::{dto::PayloadDto, transaction::TransactionId},
-        BlockDto, BlockId,
+        BlockId, BlockWrapperDto,
     },
     utils::serde::{option_string, string},
 };
@@ -151,7 +151,7 @@ pub enum ClientMethod {
     /// Post block (JSON)
     PostBlock {
         /// Block
-        block: BlockDto,
+        block: BlockWrapperDto,
     },
     /// Post block (raw)
     #[serde(rename_all = "camelCase")]
@@ -327,6 +327,6 @@ pub enum ClientMethod {
     /// Returns a block ID from a block
     BlockId {
         /// Block
-        block: BlockDto,
+        block: BlockWrapperDto,
     },
 }

bindings/core/src/method/utils.rs

@@ -12,7 +12,7 @@ use iota_sdk::types::block::{
     protocol::ProtocolParameters,
     signature::Ed25519Signature,
     slot::SlotCommitment,
-    BlockDto,
+    BlockWrapperDto,
 };
 use serde::{Deserialize, Serialize};
 
@@ -83,7 +83,7 @@ pub enum UtilsMethod {
     #[serde(rename_all = "camelCase")]
     BlockId {
         /// Block
-        block: BlockDto,
+        block: BlockWrapperDto,
         /// Network Protocol Parameters
         protocol_parameters: ProtocolParameters,
     },

bindings/core/src/method_handler/client.rs

@@ -12,7 +12,7 @@ use iota_sdk::{
                 dto::OutputDto, AccountOutput, BasicOutput, FoundryOutput, NftOutput, Output, OutputBuilderAmount, Rent,
             },
             payload::Payload,
-            Block, BlockDto,
+            BlockWrapper, BlockWrapperDto,
         },
         TryFromDto,
     },
@@ -187,7 +187,7 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
 
             let block_id = block.id();
 
-            Response::BlockIdWithBlock(block_id, BlockDto::from(&block))
+            Response::BlockIdWithBlock(block_id, BlockWrapperDto::from(&block))
         }
         #[cfg(not(target_family = "wasm"))]
         ClientMethod::UnhealthyNodes => Response::UnhealthyNodes(client.unhealthy_nodes().await.into_iter().collect()),
@@ -198,18 +198,23 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
         ClientMethod::GetIssuance => Response::Issuance(client.get_issuance().await?),
         ClientMethod::PostBlockRaw { block_bytes } => Response::BlockId(
             client
-                .post_block_raw(&Block::unpack_strict(
+                .post_block_raw(&BlockWrapper::unpack_strict(
                     &block_bytes[..],
                     &client.get_protocol_parameters().await?,
                 )?)
                 .await?,
         ),
         ClientMethod::PostBlock { block } => Response::BlockId(
             client
-                .post_block(&Block::try_from_dto(block, client.get_protocol_parameters().await?)?)
+                .post_block(&BlockWrapper::try_from_dto(
+                    block,
+                    client.get_protocol_parameters().await?,
+                )?)
                 .await?,
         ),
-        ClientMethod::GetBlock { block_id } => Response::Block(BlockDto::from(&client.get_block(&block_id).await?)),
+        ClientMethod::GetBlock { block_id } => {
+            Response::Block(BlockWrapperDto::from(&client.get_block(&block_id).await?))
+        }
         ClientMethod::GetBlockMetadata { block_id } => {
             Response::BlockMetadata(client.get_block_metadata(&block_id).await?)
         }
@@ -223,9 +228,9 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
         ClientMethod::GetOutputMetadata { output_id } => {
             Response::OutputMetadata(client.get_output_metadata(&output_id).await?)
         }
-        ClientMethod::GetIncludedBlock { transaction_id } => {
-            Response::Block(BlockDto::from(&client.get_included_block(&transaction_id).await?))
-        }
+        ClientMethod::GetIncludedBlock { transaction_id } => Response::Block(BlockWrapperDto::from(
+            &client.get_included_block(&transaction_id).await?,
+        )),
         ClientMethod::GetIncludedBlockMetadata { transaction_id } => {
             Response::BlockMetadata(client.get_included_block_metadata(&transaction_id).await?)
         }
@@ -267,7 +272,7 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
                 .find_blocks(&block_ids)
                 .await?
                 .iter()
-                .map(BlockDto::from)
+                .map(BlockWrapperDto::from)
                 .collect(),
         ),
         ClientMethod::FindInputs { addresses, amount } => {
@@ -309,7 +314,7 @@ pub(crate) async fn call_client_method_internal(client: &Client, method: ClientM
             Response::CustomJson(data)
         }
         ClientMethod::BlockId { block } => {
-            Response::BlockId(Block::try_from_dto(block, client.get_protocol_parameters().await?)?.id())
+            Response::BlockId(BlockWrapper::try_from_dto(block, client.get_protocol_parameters().await?)?.id())
         }
     };
     Ok(response)

bindings/core/src/method_handler/utils.rs

@@ -10,7 +10,7 @@ use iota_sdk::{
             input::UtxoInput,
             output::{AccountId, FoundryId, InputsCommitment, NftId, Output, OutputId, Rent, TokenId},
             payload::{transaction::TransactionEssence, TransactionPayload},
-            Block,
+            BlockWrapper,
         },
         TryFromDto,
     },
@@ -41,7 +41,7 @@ pub(crate) fn call_utils_method_internal(method: UtilsMethod) -> Result<Response
             block,
             protocol_parameters,
         } => {
-            let block = Block::try_from_dto(block, protocol_parameters)?;
+            let block = BlockWrapper::try_from_dto(block, protocol_parameters)?;
             Response::BlockId(block.id())
         }
         UtilsMethod::TransactionId { payload } => {

bindings/core/src/response.rs

@@ -30,7 +30,7 @@ use iota_sdk::{
             signature::Ed25519Signature,
             slot::SlotCommitmentId,
             unlock::Unlock,
-            BlockDto, BlockId,
+            BlockId, BlockWrapperDto,
         },
     },
     wallet::account::{
@@ -107,10 +107,10 @@ pub enum Response {
     /// Response for:
     /// - [`GetBlock`](crate::method::ClientMethod::GetBlock)
     /// - [`GetIncludedBlock`](crate::method::ClientMethod::GetIncludedBlock)
-    Block(BlockDto),
+    Block(BlockWrapperDto),
     /// Response for:
     /// - [`PostBlockPayload`](crate::method::ClientMethod::PostBlockPayload)
-    BlockIdWithBlock(BlockId, BlockDto),
+    BlockIdWithBlock(BlockId, BlockWrapperDto),
     /// Response for:
     /// - [`GetBlockMetadata`](crate::method::ClientMethod::GetBlockMetadata)
     BlockMetadata(BlockMetadataResponse),
@@ -140,7 +140,7 @@ pub enum Response {
     OutputIdsResponse(OutputIdsResponse),
     /// Response for:
     /// - [`FindBlocks`](crate::method::ClientMethod::FindBlocks)
-    Blocks(Vec<BlockDto>),
+    Blocks(Vec<BlockWrapperDto>),
     /// Response for:
     /// - [`FindInputs`](crate::method::ClientMethod::FindInputs)
     Inputs(Vec<UtxoInput>),

bindings/nodejs/examples/how_tos/nft_collection/00_mint_issuer_nft.ts

@@ -68,7 +68,7 @@ async function run() {
 
                 // New minted NFT id is empty in the output
                 if (
-                    nftOutput.getNftId() ===
+                    nftOutput.nftId ===
                     '0x0000000000000000000000000000000000000000000000000000000000000000'
                 ) {
                     const outputId = Utils.computeOutputId(

bindings/nodejs/examples/wallet/17-check-unlock-conditions.ts

@@ -38,12 +38,13 @@ async function run() {
             const basicOutput = output as BasicOutput;
             let controlledByAccount = false;
             if (
-                basicOutput.getUnlockConditions().length === 1 &&
-                basicOutput.getUnlockConditions()[0] instanceof
+                basicOutput.unlockConditions.length === 1 &&
+                basicOutput.unlockConditions[0] instanceof
                     AddressUnlockCondition &&
                 hexEncodedAccountAddresses.includes(
                     (
-                        basicOutput.getUnlockConditions()[0] as AddressUnlockCondition
+                        basicOutput
+                            .unlockConditions[0] as AddressUnlockCondition
                     ).address.toString(),
                 )
             ) {

bindings/nodejs/lib/client/client.ts

@@ -43,6 +43,7 @@ import {
     Response,
     OutputId,
     ProtocolParameters,
+    u64,
 } from '../types';
 import { OutputResponse, IOutputsResponse } from '../types/models/api';
 
@@ -203,10 +204,7 @@ export class Client {
      * @param amount The amount to find inputs for.
      * @returns An array of UTXO inputs.
      */
-    async findInputs(
-        addresses: string[],
-        amount: bigint,
-    ): Promise<UTXOInput[]> {
+    async findInputs(addresses: string[], amount: u64): Promise<UTXOInput[]> {
         const response = await this.methodHandler.callMethod({
             name: 'findInputs',
             data: {

bindings/nodejs/lib/types/block/address.ts

@@ -21,6 +21,9 @@ enum AddressType {
  * The base class for addresses.
  */
 abstract class Address {
+    /**
+     * The type of address.
+     */
     readonly type: AddressType;
 
     /**
@@ -29,12 +32,6 @@ abstract class Address {
     constructor(type: AddressType) {
         this.type = type;
     }
-    /**
-     * Get the type of address.
-     */
-    getType(): AddressType {
-        return this.type;
-    }
 
     abstract toString(): string;
 
@@ -62,6 +59,9 @@ abstract class Address {
  * An Ed25519 Address.
  */
 class Ed25519Address extends Address {
+    /**
+     * The public key hash.
+     */
     readonly pubKeyHash: HexEncodedString;
 
     /**
@@ -71,22 +71,19 @@ class Ed25519Address extends Address {
         super(AddressType.Ed25519);
         this.pubKeyHash = address;
     }
-    /**
-     * Get the public key hash.
-     */
-    getPubKeyHash(): HexEncodedString {
-        return this.pubKeyHash;
-    }
 
     toString(): string {
-        return this.getPubKeyHash();
+        return this.pubKeyHash;
     }
 }
 
 /**
  * An Account address.
  */
 class AccountAddress extends Address {
+    /**
+     * The account ID.
+     */
     readonly accountId: AccountId;
     /**
      * @param address An account address as account ID.
@@ -95,21 +92,18 @@ class AccountAddress extends Address {
         super(AddressType.Account);
         this.accountId = address;
     }
-    /**
-     * Get the account ID.
-     */
-    getAccountId(): AccountId {
-        return this.accountId;
-    }
 
     toString(): string {
-        return this.getAccountId();
+        return this.accountId;
     }
 }
 /**
  * An NFT address.
  */
 class NftAddress extends Address {
+    /**
+     * The NFT ID.
+     */
     readonly nftId: NftId;
     /**
      * @param address An NFT address as NFT ID.
@@ -118,15 +112,9 @@ class NftAddress extends Address {
         super(AddressType.Nft);
         this.nftId = address;
     }
-    /**
-     * Get the NFT ID.
-     */
-    getNftId(): NftId {
-        return this.nftId;
-    }
 
     toString(): string {
-        return this.getNftId();
+        return this.nftId;
     }
 }
 

bindings/nodejs/lib/types/block/block.ts

@@ -12,21 +12,21 @@ export class Block {
     /**
      * The protocol version under which this block operates.
      */
-    protocolVersion!: number;
+    readonly protocolVersion!: number;
     /**
      * The parent block ids.
      */
-    parents!: HexEncodedString[];
+    readonly parents!: HexEncodedString[];
     /**
      * The payload contents.
      */
     @Type(() => Payload, {
         discriminator: PayloadDiscriminator,
     })
-    payload?: Payload;
+    readonly payload?: Payload;
     /**
      * The amount of mana the Account identified by IssuerID is at most
      * willing to burn for this block.
      */
-    burnedMana!: string;
+    readonly burnedMana!: string;
 }

bindings/nodejs/lib/types/block/input/input.ts

@@ -24,13 +24,6 @@ abstract class Input {
     constructor(type: InputType) {
         this.type = type;
     }
-
-    /**
-     * Get the type of input.
-     */
-    getType(): InputType {
-        return this.type;
-    }
 }
 
 /**
@@ -40,11 +33,11 @@ class UTXOInput extends Input {
     /**
      * The transaction ID.
      */
-    transactionId: HexEncodedString;
+    readonly transactionId: HexEncodedString;
     /**
      * The output index.
      */
-    transactionOutputIndex: number;
+    readonly transactionOutputIndex: number;
 
     /**
      * @param transactionId The ID of the transaction it is an input of.