Merge branch '2.0' into feat/python-transaction-refactor

bindings/python/iota_sdk/types/balance.py

@@ -62,8 +62,14 @@ class NativeTokensBalance:
         metadata: Some metadata of the native token.
     """
     token_id: HexStr
-    total: HexStr
-    available: HexStr
+    total: int = field(metadata=config(
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
+    ))
+    available: int = field(metadata=config(
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
+    ))
     metadata: Optional[HexStr]
 
 

bindings/python/iota_sdk/types/block/basic.py

@@ -31,5 +31,5 @@ class BasicBlock:
     ))
     payload: Optional[Payload] = None
     type: int = field(
-        default_factory=lambda: BlockType.Basic,
+        default_factory=lambda: int(BlockType.Basic),
         init=False)

bindings/python/iota_sdk/types/block/validation.py

@@ -28,5 +28,5 @@ class ValidationBlock:
     highest_supported_version: int
     protocol_parameters_hash: HexStr
     type: int = field(
-        default_factory=lambda: BlockType.Validation,
+        default_factory=lambda: int(BlockType.Validation),
         init=False)

bindings/python/iota_sdk/types/native_token.py

@@ -1,7 +1,8 @@
 # Copyright 2023 IOTA Stiftung
 # SPDX-License-Identifier: Apache-2.0
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from dataclasses_json import config
 
 from iota_sdk.types.common import HexStr, json
 
@@ -16,4 +17,7 @@ class NativeToken():
         amount: The amount of native tokens.
     """
     id: HexStr
-    amount: HexStr
+    amount: int = field(metadata=config(
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
+    ))

bindings/python/iota_sdk/types/send_params.py

@@ -72,10 +72,12 @@ class CreateNativeTokenParams():
         account_id: The ID of the corresponding account.
     """
     circulating_supply: int = field(metadata=config(
-        encoder=str
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
     ))
     maximum_supply: int = field(metadata=config(
-        encoder=str
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
     ))
     foundry_metadata: Optional[str] = None
     account_id: Optional[str] = None

bindings/python/iota_sdk/types/signature.py

@@ -18,7 +18,7 @@ class Ed25519Signature:
     """
     public_key: HexStr
     signature: HexStr
-    type: int = field(default_factory=lambda: 0, init=False)
+    type: int = field(default=0, init=False)
 
 
 Signature: TypeAlias = Ed25519Signature

bindings/python/iota_sdk/types/token_scheme.py

@@ -1,9 +1,10 @@
 # Copyright 2023 IOTA Stiftung
 # SPDX-License-Identifier: Apache-2.0
 
-from dataclasses import dataclass, field
 from typing import TypeAlias
-from iota_sdk.types.common import HexStr, json
+from dataclasses import dataclass, field
+from dataclasses_json import config
+from iota_sdk.types.common import json
 
 
 @json
@@ -17,10 +18,19 @@ class SimpleTokenScheme:
         maximum_supply: The maximum supply of the token.
         type: The type code of the token scheme.
     """
-    minted_tokens: HexStr
-    melted_tokens: HexStr
-    maximum_supply: HexStr
-    type: int = field(default_factory=lambda: 0, init=False)
+    minted_tokens: int = field(metadata=config(
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
+    ))
+    melted_tokens: int = field(metadata=config(
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
+    ))
+    maximum_supply: int = field(metadata=config(
+        encoder=hex,
+        decoder=lambda v: int(v, 16)
+    ))
+    type: int = field(default=0, init=False)
 
 
 TokenScheme: TypeAlias = SimpleTokenScheme

bindings/python/iota_sdk/types/unlock.py

@@ -29,15 +29,7 @@ class UnlockType(IntEnum):
 
 @json
 @dataclass
-class Unlock:
-    """Unlock type.
-    """
-    type: int
-
-
-@json
-@dataclass
-class SignatureUnlock(Unlock):
+class SignatureUnlock:
     """An unlock holding a signature unlocking one or more inputs.
     """
     signature: Ed25519Signature
@@ -49,7 +41,7 @@ class SignatureUnlock(Unlock):
 
 @json
 @dataclass
-class ReferenceUnlock(Unlock):
+class ReferenceUnlock:
     """An unlock which must reference a previous unlock which unlocks also the input at the same index as this Reference Unlock.
     """
     reference: int