Merge branch '2.0' into alias-mismatch

bindings/nodejs/lib/client/client.ts

@@ -1,7 +1,9 @@
 // Copyright 2021-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
+import { plainToInstance } from 'class-transformer';
 import { ClientMethodHandler } from './client-method-handler';
+import { Response } from '../types';
 import {
     ClientOptions,
     Node,
@@ -18,7 +20,6 @@ import {
     NftOutputQueryParameters,
     OutputQueryParameters,
 } from '../types/client';
-import type { NodeInfoResponse } from '../types/client/nodeInfo';
 import {
     AccountOutput,
     BasicOutput,
@@ -42,39 +43,35 @@ import {
     EpochIndex,
     Address,
 } from '../types/block';
+import type { NodeInfoResponse } from '../types/client/nodeInfo';
 import {
-    BlockMetadataResponse,
-    InfoResponse,
     UTXOInput,
-    Response,
     OutputId,
     ProtocolParameters,
     u64,
     TransactionId,
     Bech32Address,
-    BlockWithMetadataResponse,
-    TransactionMetadataResponse,
 } from '../types';
 import {
-    OutputResponse,
-    OutputsResponse,
-    CongestionResponse,
-    UtxoChangesResponse,
-    UtxoChangesFullResponse,
-    CommitteeResponse,
+    BlockMetadataResponse,
+    BlockWithMetadataResponse,
+    InfoResponse,
     IssuanceBlockHeaderResponse,
+    CommitteeResponse,
+    CongestionResponse,
+    ManaRewardsResponse,
+    NetworkMetricsResponse,
     OutputMetadataResponse,
+    OutputResponse,
+    OutputsResponse,
     OutputWithMetadataResponse,
-    NetworkMetricsResponse,
-} from '../types/models/api';
-import { RoutesResponse } from '../types/models/api/routes-response';
-
-import { plainToInstance } from 'class-transformer';
-import { ManaRewardsResponse } from '../types/models/api/mana-rewards-response';
-import {
+    RoutesResponse,
+    TransactionMetadataResponse,
+    UtxoChangesFullResponse,
+    UtxoChangesResponse,
     ValidatorResponse,
     ValidatorsResponse,
-} from '../types/models/api/validators-response';
+} from '../types/models/api';
 
 /** The Client to interact with nodes. */
 export class Client {

bindings/nodejs/lib/types/client/client-options.ts

@@ -1,7 +1,7 @@
 // Copyright 2021-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { ProtocolParameters } from '../models/api/info/node-info-protocol';
+import { ProtocolParameters } from '../models/api';
 import type { MqttBrokerOptions, Node } from './network';
 
 /** Options for the client builder */

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

@@ -1,7 +1,7 @@
 // Copyright 2021-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { InfoResponse } from '../models/api/info';
+import { InfoResponse } from '../models/api';
 
 /** NodeInfo wrapper which contains the node info and the url from the node (useful when multiple nodes are used) */
 export interface NodeInfoResponse {

bindings/nodejs/lib/types/models/api/issuance-response.ts → bindings/nodejs/lib/types/models/api/blocks.ts

@@ -1,7 +1,8 @@
 // Copyright 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { BlockId, SlotCommitment, SlotIndex } from '../../block';
+import { BlockState } from '../state';
+import { Block, BlockId, SlotCommitment, SlotIndex } from '../../block';
 import { NumericString } from '../../utils';
 
 /**
@@ -34,3 +35,31 @@ export interface IssuanceBlockHeaderResponse {
      */
     shallowLikeParents?: BlockId[];
 }
+
+/**
+ * Response from the metadata endpoint.
+ */
+export interface BlockMetadataResponse {
+    /**
+     * The block id.
+     */
+    blockId: BlockId;
+    /**
+     * The block state.
+     */
+    blockState: BlockState;
+}
+
+/**
+ * Response from the full endpoint.
+ */
+export interface BlockWithMetadataResponse {
+    /**
+     * The block.
+     */
+    block: Block;
+    /**
+     * The block metadata.
+     */
+    metadata: BlockMetadataResponse;
+}

bindings/nodejs/lib/types/models/api/utxo-changes-response.ts → bindings/nodejs/lib/types/models/api/commitments.ts

@@ -1,10 +1,9 @@
 // Copyright 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { OutputId } from '../../block/output';
-import { SlotCommitmentId } from '../../block';
-import { Output, OutputDiscriminator } from '../../block/output';
 import { Type } from 'class-transformer';
+import { SlotCommitmentId } from '../../block';
+import { Output, OutputId, OutputDiscriminator } from '../../block/output';
 
 /**
  * All UTXO changes that happened at a specific slot.

bindings/nodejs/lib/types/models/api/index.ts

@@ -1,20 +1,12 @@
-// Copyright 2023 IOTA Stiftung
+// Copyright 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-export * from './info';
+export * from './accounts';
+export * from './blocks';
+export * from './commitments';
+export * from './committee';
+export * from './node';
 export * from './plugins';
-export * from './block-response';
-export * from './committee-response';
-export * from './congestion-response';
-export * from './issuance-response';
-export * from './mana-rewards-response';
-export * from './network-metrics';
-export * from './output-id-proof';
-export * from './output-metadata-response';
-export * from './output-response';
-export * from './response';
-export * from './routes-response';
-export * from './transaction-failure-reason';
-export * from './transaction-response';
-export * from './utxo-changes-response';
-export * from './validators-response';
+export * from './rewards';
+export * from './utxo';
+export * from './validators';