Node/hex: bigint fixes (#1881)

* fixed bigint on spots * format * changelog * Prepare releases --------- Co-authored-by: Thibault Martinez <thibault@iota.org>
iotaledger · Jan 29, 2024 · 4dcbc2b · 4dcbc2b
1 parent 1539710
commit 4dcbc2b
Show file tree

Hide file tree

Showing 11 changed files with 8,060 additions and 7,814 deletions.
diff --git a/bindings/nodejs/CHANGELOG.md b/bindings/nodejs/CHANGELOG.md
@@ -19,12 +19,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security -->
 
-## 1.1.5 - 2024-01-DD
+## 1.1.5 - 2024-01-29
 
 ### Added
 
 - `Utils::{verifyTransactionSyntax(), blockBytes(), blockHashWithoutNonce()}`;
 
+### Fixed
+
+- `Output` and `SimpleTokenScheme` (sub)fields not setting the `bigint` properly;
+
 ## 1.1.4 - 2023-12-07
 
 ### Added

diff --git a/bindings/nodejs/lib/types/block/output/output.ts b/bindings/nodejs/lib/types/block/output/output.ts
@@ -9,7 +9,7 @@ import { Feature, FeatureDiscriminator } from './feature';
 
 // Temp solution for not double parsing JSON
 import { plainToInstance, Type } from 'class-transformer';
-import { HexEncodedString, hexToBigInt, NumericString } from '../../utils';
+import { HexEncodedString, NumericString } from '../../utils';
 import { TokenScheme, TokenSchemeDiscriminator } from './token-scheme';
 import { INativeToken } from '../../models';
 
@@ -97,6 +97,7 @@ abstract class CommonOutput extends Output /*implements ICommonOutput*/ {
     })
     readonly unlockConditions: UnlockCondition[];
 
+    @Type(() => INativeToken)
     readonly nativeTokens?: INativeToken[];
 
     @Type(() => Feature, {
@@ -127,17 +128,6 @@ abstract class CommonOutput extends Output /*implements ICommonOutput*/ {
      * The native tokens held by the output.
      */
     getNativeTokens(): INativeToken[] | undefined {
-        if (!this.nativeTokens) {
-            return this.nativeTokens;
-        }
-
-        // 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);
-            }
-        }
         return this.nativeTokens;
     }
 

diff --git a/bindings/nodejs/lib/types/block/output/token-scheme.ts b/bindings/nodejs/lib/types/block/output/token-scheme.ts
@@ -1,6 +1,7 @@
 // Copyright 2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
+import { Transform } from 'class-transformer';
 import { hexToBigInt } from '../../utils/hex-encoding';
 
 /**
@@ -36,8 +37,11 @@ abstract class TokenScheme {
  * A simple token scheme.
  */
 class SimpleTokenScheme extends TokenScheme {
+    @Transform((value) => hexToBigInt(value.value))
     readonly mintedTokens: bigint;
+    @Transform((value) => hexToBigInt(value.value))
     readonly meltedTokens: bigint;
+    @Transform((value) => hexToBigInt(value.value))
     readonly maximumSupply: bigint;
 
     /**

diff --git a/bindings/nodejs/lib/types/models/native-token.ts b/bindings/nodejs/lib/types/models/native-token.ts
@@ -1,17 +1,20 @@
 // Copyright 2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
+import { Transform } from 'class-transformer';
 import type { HexEncodedString } from '../utils/hex-encoding';
+import { hexToBigInt } from '../utils/hex-encoding';
 /**
  * Native token.
  */
-export interface INativeToken {
+export class INativeToken {
     /**
      * Identifier of the native token.
      */
-    id: HexEncodedString;
+    id!: HexEncodedString;
     /**
      * Amount of native tokens of the given Token ID.
      */
-    amount: bigint;
+    @Transform((value) => hexToBigInt(value.value))
+    amount!: bigint;
 }