From 4315257c6f27c6e35f8a567d06425e96e95d46b6 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 18 Sep 2023 20:21:55 +0200 Subject: [PATCH 1/3] fix --- .../nodejs/examples/client/07-get-block-data.ts | 15 ++++++++++----- .../types/block/payload/transaction/essence.ts | 11 ++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/bindings/nodejs/examples/client/07-get-block-data.ts b/bindings/nodejs/examples/client/07-get-block-data.ts index 7a5750937a..9d76784927 100644 --- a/bindings/nodejs/examples/client/07-get-block-data.ts +++ b/bindings/nodejs/examples/client/07-get-block-data.ts @@ -7,6 +7,9 @@ require('dotenv').config({ path: '.env' }); // Run with command: // yarn run-example ./client/07-get-block-data.ts +// Set a specific block id or leave undefined for getting a tip. +let ID: string | undefined = '0x1234'; + // In this example we will send a block and get the data and metadata for it. async function run() { initLogger(); @@ -22,15 +25,17 @@ async function run() { try { // Fetch a block ID from the node. const blockIds = await client.getTips(); - console.log('Block IDs:', blockIds, '\n'); + + const blockId = ID || blockIds[0]; + console.log('Block ID:', blockId, '\n'); // Get the metadata for the block. - const blockMetadata = await client.getBlockMetadata(blockIds[0]); - console.log('Block metadata: ', blockMetadata, '\n'); + const blockMetadata = await client.getBlockMetadata(blockId); + console.log('Block metadata:', blockMetadata, '\n'); // Request the block by its id. - const blockData = await client.getBlock(blockIds[0]); - console.log('Block data: ', blockData, '\n'); + const blockData = await client.getBlock(blockId); + console.log('Block data:', blockData, '\n'); } catch (error) { console.error('Error: ', error); } diff --git a/bindings/nodejs/lib/types/block/payload/transaction/essence.ts b/bindings/nodejs/lib/types/block/payload/transaction/essence.ts index ff72fa6a0b..8d16f39aad 100644 --- a/bindings/nodejs/lib/types/block/payload/transaction/essence.ts +++ b/bindings/nodejs/lib/types/block/payload/transaction/essence.ts @@ -2,11 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 import { Type } from 'class-transformer'; -import { PayloadDiscriminator } from '..'; import { HexEncodedString } from '../../../utils'; import { Input, InputDiscriminator } from '../../input'; import { Output, OutputDiscriminator } from '../../output'; -import { Payload } from '../payload'; +import { TaggedDataPayload } from '../tagged'; /** * All of the essence types. @@ -57,10 +56,8 @@ class RegularTransactionEssence extends TransactionEssence { }) outputs: Output[]; - @Type(() => Payload, { - discriminator: PayloadDiscriminator, - }) - payload: Payload | undefined; + @Type(() => TaggedDataPayload) + payload?: TaggedDataPayload; /** * @param networkId The ID of the network the transaction was issued to. @@ -75,7 +72,7 @@ class RegularTransactionEssence extends TransactionEssence { inputsCommitment: HexEncodedString, inputs: Input[], outputs: Output[], - payload: Payload | undefined, + payload: TaggedDataPayload | undefined, ) { super(TransactionEssenceType.Regular); this.networkId = networkId; From dd9bb592b25b4906b761b86e6d5970159ff5792e Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 18 Sep 2023 20:29:45 +0200 Subject: [PATCH 2/3] lint --- bindings/nodejs/examples/client/07-get-block-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/nodejs/examples/client/07-get-block-data.ts b/bindings/nodejs/examples/client/07-get-block-data.ts index 9d76784927..1a5f49caaa 100644 --- a/bindings/nodejs/examples/client/07-get-block-data.ts +++ b/bindings/nodejs/examples/client/07-get-block-data.ts @@ -8,7 +8,7 @@ require('dotenv').config({ path: '.env' }); // yarn run-example ./client/07-get-block-data.ts // Set a specific block id or leave undefined for getting a tip. -let ID: string | undefined = '0x1234'; +const ID: string | undefined = '0x1234'; // In this example we will send a block and get the data and metadata for it. async function run() { From cd4d33830be504ec44689def4419b1ec2edba604 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 18 Sep 2023 21:25:56 +0200 Subject: [PATCH 3/3] changelog --- bindings/nodejs/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bindings/nodejs/CHANGELOG.md b/bindings/nodejs/CHANGELOG.md index 93c275a525..552590c384 100644 --- a/bindings/nodejs/CHANGELOG.md +++ b/bindings/nodejs/CHANGELOG.md @@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security --> +## 1.0.12 - 2023-09-14 + +### Changed + +- `RegularTransactionEssence.payload` field type to an optional `TaggedDataPayload`; + ## 1.0.11 - 2023-09-14 ### Fixed