Merge branch '2.0' into version-signaling-parameters

bindings/core/src/method/client.rs

@@ -20,7 +20,7 @@ use iota_sdk::{
             DelegationId, FoundryId, NftId, OutputId, TokenScheme,
         },
         payload::{dto::PayloadDto, signed_transaction::TransactionId},
-        BlockDto, BlockId, IssuerId,
+        BlockDto, BlockId,
     },
     utils::serde::{option_string, string},
 };
@@ -126,7 +126,7 @@ pub enum ClientMethod {
     #[serde(rename_all = "camelCase")]
     BuildBasicBlock {
         /// The issuer's ID.
-        issuer_id: IssuerId,
+        issuer_id: AccountId,
         /// The block payload.
         #[serde(default)]
         payload: Option<PayloadDto>,

bindings/core/src/method/wallet.rs

@@ -191,6 +191,10 @@ pub enum WalletMethod {
     /// Returns the implicit account creation address of the wallet if it is Ed25519 based.
     /// Expected response: [`Bech32Address`](crate::Response::Bech32Address)
     ImplicitAccountCreationAddress,
+    /// Prepares to transition an implicit account to an account.
+    /// Expected response: [`PreparedTransaction`](crate::Response::PreparedTransaction)
+    #[serde(rename_all = "camelCase")]
+    PrepareImplicitAccountTransition { output_id: OutputId },
     /// Returns the implicit accounts of the wallet.
     /// Expected response: [`OutputsData`](crate::Response::OutputsData)
     ImplicitAccounts,

bindings/core/src/method_handler/wallet.rs

@@ -210,6 +210,10 @@ pub(crate) async fn call_wallet_method_internal(wallet: &Wallet, method: WalletM
             let implicit_account_creation_address = wallet.implicit_account_creation_address().await?;
             Response::Bech32Address(implicit_account_creation_address)
         }
+        WalletMethod::PrepareImplicitAccountTransition { output_id } => {
+            let data = wallet.prepare_implicit_account_transition(&output_id).await?;
+            Response::PreparedTransaction(PreparedTransactionDataDto::from(&data))
+        }
         WalletMethod::ImplicitAccounts => {
             let implicit_accounts = wallet.implicit_accounts().await;
             Response::OutputsData(implicit_accounts.iter().map(OutputDataDto::from).collect())

bindings/core/src/response.rs

@@ -284,6 +284,7 @@ pub enum Response {
     /// - [`PrepareStopParticipating`](crate::method::WalletMethod::PrepareStopParticipating)
     /// - [`PrepareTransaction`](crate::method::WalletMethod::PrepareTransaction)
     /// - [`PrepareVote`](crate::method::WalletMethod::PrepareVote)
+    /// - [`PrepareImplicitAccountTransition`](crate::method::WalletMethod::PrepareImplicitAccountTransition)
     PreparedTransaction(PreparedTransactionDataDto),
     /// Response for:
     /// - [`PrepareCreateNativeToken`](crate::method::WalletMethod::PrepareCreateNativeToken),

bindings/core/tests/combined.rs

@@ -11,7 +11,7 @@ use iota_sdk::{
     types::{
         block::{
             payload::{dto::PayloadDto, Payload, TaggedDataPayload},
-            Block, BlockBodyDto, IssuerId,
+            Block, BlockBodyDto,
         },
         TryFromDto,
     },
@@ -126,7 +126,7 @@ async fn client_from_wallet() -> Result<()> {
 //     let response = call_client_method(
 //         &client,
 //         ClientMethod::BuildBasicBlock {
-//             issuer_id: IssuerId::null(),
+//             issuer_id: AccountId::null(),
 //             payload: Some(payload.clone()),
 //         },
 //     )

bindings/nodejs/examples/client/05-get-address-balance.ts

@@ -54,11 +54,14 @@ async function run() {
         for (const outputResponse of addressOutputs) {
             const output = outputResponse['output'];
             if (output instanceof CommonOutput) {
-                (output as CommonOutput).getNativeTokens()?.forEach((token) => {
-                    totalNativeTokens[token.id] =
-                        (totalNativeTokens[token.id] || BigInt(0)) +
-                        token.amount;
-                });
+                const nativeTokenFeature = (
+                    output as CommonOutput
+                ).getNativeToken();
+                if (nativeTokenFeature != undefined) {
+                    totalNativeTokens[nativeTokenFeature.id] =
+                        (totalNativeTokens[nativeTokenFeature.id] ||
+                            BigInt(0)) + nativeTokenFeature.amount;
+                }
             }
 
             totalAmount += output.getAmount();

bindings/nodejs/examples/how_tos/accounts_and_addresses/consolidate-outputs.ts

@@ -49,11 +49,11 @@ async function run() {
         outputs.forEach(({ output, address }, i) => {
             console.log(`OUTPUT #${i}`);
             console.log(
-                '- address: %s\n- amount: %d\n- native tokens: %s',
+                '- address: %s\n- amount: %d\n- native token: %s',
                 Utils.hexToBech32(address.toString(), 'rms'),
                 output.getAmount(),
                 output instanceof CommonOutput
-                    ? (output as CommonOutput).getNativeTokens()
+                    ? (output as CommonOutput).getNativeToken() ?? []
                     : [],
             );
         });
@@ -91,7 +91,7 @@ async function run() {
                 Utils.hexToBech32(address.toString(), 'rms'),
                 output.getAmount(),
                 output instanceof CommonOutput
-                    ? (output as CommonOutput).getNativeTokens()
+                    ? (output as CommonOutput).getNativeToken()
                     : undefined,
             );
         });

bindings/nodejs/lib/client/client.ts

@@ -42,7 +42,6 @@ import {
     NftId,
     FoundryId,
     DelegationId,
-    IssuerId,
     UnsignedBlock,
     parseUnsignedBlock,
 } from '../types/block';
@@ -273,7 +272,7 @@ export class Client {
      * @returns The block ID followed by the block containing the payload.
      */
     async buildBasicBlock(
-        issuerId: IssuerId,
+        issuerId: AccountId,
         payload?: Payload,
     ): Promise<UnsignedBlock> {
         const response = await this.methodHandler.callMethod({

bindings/nodejs/lib/types/block/core/signed-block.ts

@@ -1,7 +1,7 @@
 // Copyright 2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { IssuerId } from '../id';
+import { AccountId } from '../id';
 import { Signature, SignatureDiscriminator } from '../signature';
 import { SlotCommitmentId, SlotIndex } from '../slot';
 import { u64 } from '../../utils/type-aliases';
@@ -38,7 +38,7 @@ class SignedBlock {
     /**
      * The identifier of the account that issued this block.
      */
-    readonly issuerId!: IssuerId;
+    readonly issuerId!: AccountId;
 
     @Type(() => Block, {
         discriminator: BlockDiscriminator,
@@ -59,7 +59,7 @@ class SignedBlock {
         issuingTime: u64,
         slotCommitmentId: SlotCommitmentId,
         latestFinalizedSlot: SlotIndex,
-        issuerId: IssuerId,
+        issuerId: AccountId,
         block: Block,
         signature: Signature,
     ) {
@@ -147,7 +147,7 @@ class UnsignedBlock {
     /**
      * The identifier of the account that issued this block.
      */
-    readonly issuerId!: IssuerId;
+    readonly issuerId!: AccountId;
 
     @Type(() => Block, {
         discriminator: BlockDiscriminator,
@@ -160,7 +160,7 @@ class UnsignedBlock {
         issuingTime: u64,
         slotCommitmentId: SlotCommitmentId,
         latestFinalizedSlot: SlotIndex,
-        issuerId: IssuerId,
+        issuerId: AccountId,
         block: Block,
     ) {
         this.protocolVersion = protocolVersion;

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

@@ -33,11 +33,6 @@ export type TokenId = HexEncodedString;
  */
 export type FoundryId = HexEncodedString;
 
-/**
- * An Issuer ID represented as hex-encoded string.
- */
-export type IssuerId = HexEncodedString;
-
 /**
  * Unique identifier of the Delegation Output, which is the BLAKE2b-256 hash of the Output ID that created it.
  */

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

@@ -8,8 +8,10 @@ import {
     BlockIssuerKey,
     BlockIssuerKeyDiscriminator,
 } from './block-issuer-key';
-import { u64 } from '../../utils/type-aliases';
+import { u256, u64 } from '../../utils/type-aliases';
 import { EpochIndex } from '../../block/slot';
+import { INativeToken } from '../../models/native-token';
+import { HexEncodedString } from '../../utils/hex-encoding';
 
 /**
  * All of the feature block types.
@@ -113,6 +115,40 @@ class TagFeature extends Feature {
     }
 }
 
+/**
+ * Native token feature.
+ */
+class NativeTokenFeature extends Feature {
+    /**
+     * Identifier of the native token.
+     */
+    readonly id: HexEncodedString;
+    /**
+     * Amount of native tokens of the given Token ID.
+     */
+    readonly amount: u256;
+
+    /**
+     * Creates a new `NativeTokenFeature`.
+     * @param nativeToken The native token stored with the feature.
+     */
+    constructor(nativeToken: INativeToken) {
+        super(FeatureType.NativeToken);
+        this.id = nativeToken.id;
+        this.amount = nativeToken.amount;
+    }
+
+    /**
+     * Returns the native token contained in this feature.
+     */
+    public asNativeToken(): INativeToken {
+        return {
+            id: this.id,
+            amount: this.amount,
+        };
+    }
+}
+
 /**
  * Block Issuer feature.
  */
@@ -178,6 +214,7 @@ const FeatureDiscriminator = {
         { value: IssuerFeature, name: FeatureType.Issuer as any },
         { value: MetadataFeature, name: FeatureType.Metadata as any },
         { value: TagFeature, name: FeatureType.Tag as any },
+        { value: NativeTokenFeature, name: FeatureType.NativeToken as any },
         { value: BlockIssuerFeature, name: FeatureType.BlockIssuer as any },
         { value: StakingFeature, name: FeatureType.Staking as any },
     ],
@@ -191,6 +228,7 @@ export {
     IssuerFeature,
     MetadataFeature,
     TagFeature,
+    NativeTokenFeature,
     BlockIssuerFeature,
     StakingFeature,
 };

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

@@ -5,15 +5,15 @@ import {
     UnlockCondition,
     UnlockConditionDiscriminator,
 } from './unlock-condition';
-import { Feature, FeatureDiscriminator } from './feature';
+import { Feature, FeatureDiscriminator, NativeTokenFeature } from './feature';
 
 // Temp solution for not double parsing JSON
 import { plainToInstance, Type } from 'class-transformer';
-import { HexEncodedString, hexToBigInt, NumericString, u64 } from '../../utils';
+import { HexEncodedString, NumericString, u64 } from '../../utils';
 import { TokenScheme, TokenSchemeDiscriminator } from './token-scheme';
-import { INativeToken } from '../../models';
 import { AccountId, NftId, AnchorId, DelegationId } from '../id';
 import { EpochIndex } from '../../block/slot';
+import { INativeToken } from '../../models/native-token';
 
 export type OutputId = HexEncodedString;
 
@@ -102,9 +102,6 @@ abstract class CommonOutput extends Output {
     })
     readonly unlockConditions: UnlockCondition[];
 
-    // Getter transforms it into nativeTokens with a proper number
-    private nativeTokens?: INativeToken[];
-
     /**
      * The features contained by the output.
      */
@@ -126,22 +123,21 @@ abstract class CommonOutput extends Output {
         super(type, amount);
         this.unlockConditions = unlockConditions;
     }
+
     /**
-     * The native tokens held by the output.
+     * The native token held by the output.
      */
-    getNativeTokens(): INativeToken[] | undefined {
-        if (!this.nativeTokens) {
-            return this.nativeTokens;
+    getNativeToken(): INativeToken | undefined {
+        if (!this.features) {
+            return undefined;
         }
 
-        // Make sure the amount of native tokens are of bigint type.
-        for (let i = 0; i < this.nativeTokens.length; i++) {
-            const token = this.nativeTokens[i];
-            if (typeof token.amount === 'string') {
-                this.nativeTokens[i].amount = hexToBigInt(token.amount);
+        for (const feature of this.features) {
+            if (feature instanceof NativeTokenFeature) {
+                return (feature as NativeTokenFeature).asNativeToken();
             }
         }
-        return this.nativeTokens;
+        return undefined;
     }
 }
 

bindings/nodejs/lib/types/client/bridge/client.ts

@@ -10,7 +10,6 @@ import type {
     SignedBlock,
     BlockId,
     FoundryId,
-    IssuerId,
     AnchorId,
     NftId,
     DelegationId,
@@ -111,7 +110,7 @@ export interface __SignatureUnlockMethod__ {
 export interface __BuildBasicBlockMethod__ {
     name: 'buildBasicBlock';
     data: {
-        issuerId: IssuerId;
+        issuerId: AccountId;
         payload?: Payload;
     };
 }