Plomin deser (#420)

* Add OrderedSet as a serialization type

* Minor fixes

* All tests passing

* Fix qa

* Fix failed tests in ^3.11

Author: cffls

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v4

Makefile

@@ -57,6 +57,9 @@ clean-test: ## remove test and coverage artifacts
 test: ## runs tests
 	poetry run pytest -vv -n 4
 
+test-integration: ## runs integration tests
+	cd integration-test && ./run_tests.sh
+
 test-single: ## runs tests with "single" markers
 	poetry run pytest -s -vv -m single
 

integration-test/configs/local-chang/shelley-genesis.json

@@ -21,7 +21,7 @@
         "keyDeposit": 1000000,
         "protocolVersion": {
             "minor": 0,
-            "major": 9
+            "major": 10
         },
         "poolDeposit": 1000000,
         "a0": 0.0,

integration-test/docker-compose-chang.yml

@@ -9,7 +9,7 @@ networks:
 services:
 
   cardano-node:
-    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.3}
+    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.4}
     platform: linux/amd64
     entrypoint: bash
     environment:
@@ -35,7 +35,7 @@ services:
         max-file: "10"
 
   cardano-pool:
-    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.3}
+    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.4}
     platform: linux/amd64
     entrypoint: bash
     environment:
@@ -56,7 +56,7 @@ services:
         max-file: "10"
 
   ogmios:
-    image: cardanosolutions/ogmios:v6.9.0
+    image: cardanosolutions/ogmios:v6.11.0
     platform: linux/amd64
     environment:
       NETWORK: "${NETWORK:-local-alonzo}"

integration-test/run_tests.sh

@@ -5,7 +5,7 @@ set -o pipefail
 
 ROOT=$(pwd)
 
-poetry install
+poetry install -C ..
 #poetry run pip install ogmios
 
 ##########

poetry.lock

@@ -45,7 +45,7 @@ def __post_init__(self):
             self._CODE = 1
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(
         cls: Type[StakeCredential], values: Union[list, tuple]
     ) -> StakeCredential:
@@ -67,7 +67,7 @@ def __post_init__(self):
         self._CODE = 0
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(
         cls: Type[StakeRegistration], values: Union[list, tuple]
     ) -> StakeRegistration:
@@ -87,7 +87,7 @@ def __post_init__(self):
         self._CODE = 1
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(
         cls: Type[StakeDeregistration], values: Union[list, tuple]
     ) -> StakeDeregistration:
@@ -109,7 +109,7 @@ def __post_init__(self):
         self._CODE = 2
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(
         cls: Type[StakeDelegation], values: Union[list, tuple]
     ) -> StakeDelegation:
@@ -138,7 +138,7 @@ def to_primitive(self):
         return super().to_primitive()
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(
         cls: Type[PoolRegistration], values: Union[list, tuple]
     ) -> PoolRegistration:
@@ -166,7 +166,7 @@ def __post_init__(self):
         self._CODE = 4
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(
         cls: Type[PoolRetirement], values: Union[list, tuple]
     ) -> PoolRetirement:

pycardano/certificate.py

@@ -123,7 +123,9 @@ def to_primitive(self) -> Primitive:
         return self.data.to_primitive()
 
     @classmethod
-    def from_primitive(cls: Type[AuxiliaryData], value: Primitive) -> AuxiliaryData:
+    def from_primitive(
+        cls: Type[AuxiliaryData], value: Primitive, type_args: Optional[tuple] = None
+    ) -> AuxiliaryData:
         for t in [AlonzoMetadata, ShelleyMarryMetadata, Metadata]:
             # The schema of metadata in different eras are mutually exclusive, so we can try deserializing
             # them one by one without worrying about mismatch.

pycardano/metadata.py

@@ -35,7 +35,7 @@ class NativeScript(ArrayCBORSerializable):
     json_field: ClassVar[str]
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(
         cls: Type[NativeScript], value: list
     ) -> Union[

pycardano/nativescript.py

@@ -989,7 +989,7 @@ class Redeemer(ArrayCBORSerializable):
     ex_units: Optional[ExecutionUnits] = None
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(cls: Type[Redeemer], values: list) -> Redeemer:
         if isinstance(values[2], CBORTag) and cls is Redeemer:
             values[2] = RawPlutusData.from_primitive(values[2])
@@ -1028,7 +1028,7 @@ class RedeemerValue(ArrayCBORSerializable):
     ex_units: ExecutionUnits
 
     @classmethod
-    @limit_primitive_type(list)
+    @limit_primitive_type(list, tuple)
     def from_primitive(cls: Type[RedeemerValue], values: list) -> RedeemerValue:
         if isinstance(values[0], CBORTag) and cls is RedeemerValue:
             values[0] = RawPlutusData.from_primitive(values[0])