Merge pull request #1685 from input-output-hk/feat/strict-deserialization

feat(core): opt-in strict CBOR deserialization mode

Author: mkazlauskas

packages/core/src/Serialization/Certificates/AuthCommitteeHot.ts

@@ -3,6 +3,7 @@ import { CborReader, CborWriter } from '../CBOR';
 import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -86,7 +87,7 @@ export class AuthCommitteeHot {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const coldType = Number(reader.readInt()) as Cardano.CredentialType;
+    const coldType = readCredentialType(reader);
     const coldHash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();
@@ -99,7 +100,7 @@ export class AuthCommitteeHot {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const hotType = Number(reader.readInt()) as Cardano.CredentialType;
+    const hotType = readCredentialType(reader);
     const hotHash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();

packages/core/src/Serialization/Certificates/DRep/DRep.ts

@@ -2,7 +2,7 @@ import * as Crypto from '@cardano-sdk/crypto';
 import { CborReader, CborWriter } from '../../CBOR';
 import { CredentialType } from '../../../Cardano/Address/Address';
 import { DRepKind } from './DRepKind';
-import { HexBlob } from '@cardano-sdk/util';
+import { HexBlob, InvalidStateError } from '@cardano-sdk/util';
 import { isDRepAlwaysAbstain, isDRepAlwaysNoConfidence } from '../../../Cardano/types/Governance';
 import type * as Cardano from '../../../Cardano';
 
@@ -91,8 +91,9 @@ export class DRep {
     reader.readEndArray();
 
     if (kind === DRepKind.Abstain) return DRep.newAlwaysAbstain();
+    if (kind === DRepKind.NoConfidence) return DRep.newAlwaysNoConfidence();
 
-    return DRep.newAlwaysNoConfidence();
+    throw new InvalidStateError(`Unexpected kind value: ${kind}`);
   }
 
   /**

packages/core/src/Serialization/Certificates/RegisterDelegateRepresentative.ts

@@ -5,6 +5,7 @@ import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
 import { hexToBytes } from '../../util/misc';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -100,7 +101,7 @@ export class RegisterDelegateRepresentative {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const type = Number(reader.readInt()) as Cardano.CredentialType;
+    const type = readCredentialType(reader);
     const hash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();

packages/core/src/Serialization/Certificates/Registration.ts

@@ -3,6 +3,7 @@ import { CborReader, CborWriter } from '../CBOR';
 import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -95,7 +96,7 @@ export class Registration {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const type = Number(reader.readInt()) as Cardano.CredentialType;
+    const type = readCredentialType(reader);
     const hash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();

packages/core/src/Serialization/Certificates/ResignCommitteeCold.ts

@@ -5,6 +5,7 @@ import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
 import { hexToBytes } from '../../util/misc';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -90,7 +91,7 @@ export class ResignCommitteeCold {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const coldType = Number(reader.readInt()) as Cardano.CredentialType;
+    const coldType = readCredentialType(reader);
     const coldHash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
     reader.readEndArray();
 

packages/core/src/Serialization/Certificates/StakeDelegation.ts

@@ -4,6 +4,7 @@ import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
 import { PoolId } from '../../Cardano/types/StakePool';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 3;
@@ -92,7 +93,7 @@ export class StakeDelegation {
         `Expected an array of ${CREDENTIAL_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const type = Number(reader.readInt()) as Cardano.CredentialType;
+    const type = readCredentialType(reader);
     const hash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();

packages/core/src/Serialization/Certificates/StakeDeregistration.ts

@@ -3,6 +3,7 @@ import { CborReader, CborWriter } from '../CBOR';
 import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -86,7 +87,7 @@ export class StakeDeregistration {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const type = Number(reader.readInt()) as Cardano.CredentialType;
+    const type = readCredentialType(reader);
     const hash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();

packages/core/src/Serialization/Certificates/StakeRegistration.ts

@@ -3,6 +3,7 @@ import { CborReader, CborWriter } from '../CBOR';
 import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -86,7 +87,7 @@ export class StakeRegistration {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const type = Number(reader.readInt()) as Cardano.CredentialType;
+    const type = readCredentialType(reader);
     const hash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();

packages/core/src/Serialization/Certificates/StakeRegistrationDelegation.ts

@@ -4,6 +4,7 @@ import { CertificateKind } from './CertificateKind';
 import { CertificateType } from '../../Cardano/types/Certificate';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
 import { PoolId } from '../../Cardano/types/StakePool';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -90,7 +91,7 @@ export class StakeRegistrationDelegation {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const type = Number(reader.readInt()) as Cardano.CredentialType;
+    const type = readCredentialType(reader);
     const hash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();

packages/core/src/Serialization/Certificates/StakeVoteDelegation.ts

@@ -6,6 +6,7 @@ import { DRep } from './DRep';
 import { HexBlob, InvalidArgumentError } from '@cardano-sdk/util';
 import { PoolId } from '../../Cardano/types/StakePool';
 import { hexToBytes } from '../../util/misc';
+import { readCredentialType } from '../Common/Credential';
 import type * as Cardano from '../../Cardano';
 
 const EMBEDDED_GROUP_SIZE = 2;
@@ -95,7 +96,7 @@ export class StakeVoteDelegation {
         `Expected an array of ${EMBEDDED_GROUP_SIZE} elements, but got an array of ${length} elements`
       );
 
-    const type = Number(reader.readInt()) as Cardano.CredentialType;
+    const type = readCredentialType(reader);
     const hash = Crypto.Hash28ByteBase16(HexBlob.fromBytes(reader.readByteString()));
 
     reader.readEndArray();