@polkadot/types-codec 16.2.1 → 16.3.1

package/cjs/extended/WrapperKeepOpaque.js

@@ -24,15 +24,15 @@ function decodeRaw(registry, typeName, value) {
     return [Type, instance, (0, util_1.compactAddLength)(instance.toU8a())];
 }
 class WrapperKeepOpaque extends Bytes_js_1.Bytes {
-    __internal__Type;
-    __internal__decoded;
-    __internal__opaqueName;
+    #Type;
+    #decoded;
+    #opaqueName;
     constructor(registry, typeName, value, { opaqueName = 'WrapperKeepOpaque' } = {}) {
         const [Type, decoded, u8a] = decodeRaw(registry, typeName, value);
         super(registry, u8a);
-        this.__internal__Type = Type;
-        this.__internal__decoded = decoded;
-        this.__internal__opaqueName = opaqueName;
+        this.#Type = Type;
+        this.#decoded = decoded;
+        this.#opaqueName = opaqueName;
     }
     static with(Type) {
         return class extends WrapperKeepOpaque {
@@ -45,15 +45,15 @@ class WrapperKeepOpaque extends Bytes_js_1.Bytes {
      * @description Checks if the wrapper is decodable
      */
     get isDecoded() {
-        return !!this.__internal__decoded;
+        return !!this.#decoded;
     }
     /**
      * @description Returns a breakdown of the hex encoding for this Codec
      */
     inspect() {
-        return this.__internal__decoded
+        return this.#decoded
             ? {
-                inner: [this.__internal__decoded.inspect()],
+                inner: [this.#decoded.inspect()],
                 outer: [(0, util_1.compactToU8a)(this.length)]
             }
             : {
@@ -64,40 +64,40 @@ class WrapperKeepOpaque extends Bytes_js_1.Bytes {
      * @description Converts the Object to to a human-friendly JSON, with additional fields, expansion and formatting of information
      */
     toHuman(isExtended, disableAscii) {
-        return this.__internal__decoded
-            ? this.__internal__decoded.toHuman(isExtended, disableAscii)
+        return this.#decoded
+            ? this.#decoded.toHuman(isExtended, disableAscii)
             : super.toHuman(isExtended, disableAscii);
     }
     /**
      * @description Converts the value in a best-fit primitive form
      */
     toPrimitive(disableAscii) {
-        return this.__internal__decoded
-            ? this.__internal__decoded.toPrimitive(disableAscii)
+        return this.#decoded
+            ? this.#decoded.toPrimitive(disableAscii)
             : super.toPrimitive(disableAscii);
     }
     /**
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return `${this.__internal__opaqueName}<${this.registry.getClassName(this.__internal__Type) || (this.__internal__decoded ? this.__internal__decoded.toRawType() : new this.__internal__Type(this.registry).toRawType())}>`;
+        return `${this.#opaqueName}<${this.registry.getClassName(this.#Type) || (this.#decoded ? this.#decoded.toRawType() : new this.#Type(this.registry).toRawType())}>`;
     }
     /**
      * @description Converts the Object to to a string (either decoded or bytes)
      */
     toString() {
-        return this.__internal__decoded
-            ? this.__internal__decoded.toString()
+        return this.#decoded
+            ? this.#decoded.toString()
             : super.toString();
     }
     /**
      * @description Returns the decoded that the WrapperKeepOpaque represents (if available), throws if non-decodable
      */
     unwrap() {
-        if (!this.__internal__decoded) {
-            throw new Error(`${this.__internal__opaqueName}: unwrapping an undecodable value`);
+        if (!this.#decoded) {
+            throw new Error(`${this.#opaqueName}: unwrapping an undecodable value`);
         }
-        return this.__internal__decoded;
+        return this.#decoded;
     }
 }
 exports.WrapperKeepOpaque = WrapperKeepOpaque;

package/cjs/native/Float.js

@@ -16,14 +16,14 @@ class Float extends Number {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__bitLength;
+    #bitLength;
     constructor(registry, value, { bitLength = 32 } = {}) {
         super((0, util_1.isU8a)(value) || (0, util_1.isHex)(value)
             ? value.length === 0
                 ? 0
                 : (0, util_1.u8aToFloat)((0, util_1.u8aToU8a)(value), { bitLength })
             : (value || 0));
-        this.__internal__bitLength = bitLength;
+        this.#bitLength = bitLength;
         this.encodedLength = bitLength / 8;
         this.initialU8aLength = this.encodedLength;
         this.registry = registry;
@@ -97,14 +97,14 @@ class Float extends Number {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return `f${this.__internal__bitLength}`;
+        return `f${this.#bitLength}`;
     }
     /**
      * @description Encodes the value as a Uint8Array as per the SCALE specifications
      */
     toU8a(_isBare) {
         return (0, util_1.floatToU8a)(this, {
-            bitLength: this.__internal__bitLength
+            bitLength: this.#bitLength
         });
     }
 }

package/cjs/native/Set.js

@@ -73,13 +73,13 @@ class CodecSet extends Set {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__allowed;
-    __internal__byteLength;
+    #allowed;
+    #byteLength;
     constructor(registry, setValues, value, bitLength = 8) {
         super(decodeSet(setValues, value, bitLength));
         this.registry = registry;
-        this.__internal__allowed = setValues;
-        this.__internal__byteLength = bitLength / 8;
+        this.#allowed = setValues;
+        this.#byteLength = bitLength / 8;
     }
     static with(values, bitLength) {
         return class extends CodecSet {
@@ -101,7 +101,7 @@ class CodecSet extends Set {
      * @description The length of the value when encoded as a Uint8Array
      */
     get encodedLength() {
-        return this.__internal__byteLength;
+        return this.#byteLength;
     }
     /**
      * @description returns a hash of the contents
@@ -125,7 +125,7 @@ class CodecSet extends Set {
      * @description The encoded value for the set members
      */
     get valueEncoded() {
-        return encodeSet(this.__internal__allowed, this.strings);
+        return encodeSet(this.#allowed, this.strings);
     }
     /**
      * @description adds a value to the Set (extended to allow for validity checking)
@@ -134,7 +134,7 @@ class CodecSet extends Set {
         // ^^^ add = () property done to assign this instance's this, otherwise Set.add creates "some" chaos
         // we have the isUndefined(this._setValues) in here as well, add is used internally
         // in the Set constructor (so it is undefined at this point, and should allow)
-        if (this.__internal__allowed && (0, util_1.isUndefined)(this.__internal__allowed[key])) {
+        if (this.#allowed && (0, util_1.isUndefined)(this.#allowed[key])) {
             throw new Error(`Set: Invalid key '${key}' on add`);
         }
         super.add(key);
@@ -198,7 +198,7 @@ class CodecSet extends Set {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return (0, util_1.stringify)({ _set: this.__internal__allowed });
+        return (0, util_1.stringify)({ _set: this.#allowed });
     }
     /**
      * @description Returns the string representation of the value
@@ -211,7 +211,7 @@ class CodecSet extends Set {
      */
     toU8a(_isBare) {
         return (0, util_1.bnToU8a)(this.valueEncoded, {
-            bitLength: this.__internal__byteLength * 8,
+            bitLength: this.#byteLength * 8,
             isLe: true
         });
     }

package/cjs/native/Struct.js

@@ -81,8 +81,8 @@ class Struct extends Map {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__jsonMap;
-    __internal__Types;
+    #jsonMap;
+    #Types;
     constructor(registry, Types, value, jsonMap = new Map(), { definition, setDefinition = noopSetDefinition } = {}) {
         const typeMap = definition || setDefinition((0, index_js_1.mapToTypeMap)(registry, Types));
         const [decoded, decodedLength] = (0, util_1.isU8a)(value) || (0, util_1.isHex)(value)
@@ -93,8 +93,8 @@ class Struct extends Map {
         super(decoded);
         this.initialU8aLength = decodedLength;
         this.registry = registry;
-        this.__internal__jsonMap = jsonMap;
-        this.__internal__Types = typeMap;
+        this.#jsonMap = jsonMap;
+        this.#Types = typeMap;
     }
     static with(Types, jsonMap) {
         let definition;
@@ -114,7 +114,7 @@ class Struct extends Map {
      * @description The available keys for this struct
      */
     get defKeys() {
-        return this.__internal__Types[1];
+        return this.#Types[1];
     }
     /**
      * @description Checks if the value is an empty value '{}'
@@ -143,7 +143,7 @@ class Struct extends Map {
      */
     get Type() {
         const result = {};
-        const [Types, keys] = this.__internal__Types;
+        const [Types, keys] = this.#Types;
         for (let i = 0, count = keys.length; i < count; i++) {
             result[keys[i]] = new Types[i](this.registry).toRawType();
         }
@@ -221,7 +221,7 @@ class Struct extends Map {
         for (const [k, v] of this.entries()) {
             // Here we pull out the entry against the JSON mapping (if supplied)
             // since this representation goes over RPC and needs to be correct
-            json[(this.__internal__jsonMap.get(k) || k)] = v.toJSON();
+            json[(this.#jsonMap.get(k) || k)] = v.toJSON();
         }
         return json;
     }
@@ -239,7 +239,7 @@ class Struct extends Map {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return (0, util_1.stringify)((0, index_js_1.typesToMap)(this.registry, this.__internal__Types));
+        return (0, util_1.stringify)((0, index_js_1.typesToMap)(this.registry, this.#Types));
     }
     /**
      * @description Returns the string representation of the value

package/cjs/native/Text.js

@@ -43,7 +43,7 @@ class Text extends String {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__override = null;
+    #override = null;
     constructor(registry, value) {
         const [str, decodedLength] = decodeText(value);
         super(str);
@@ -98,7 +98,7 @@ class Text extends String {
      * @description Set an override value for this
      */
     setOverride(override) {
-        this.__internal__override = override;
+        this.#override = override;
     }
     /**
      * @description Returns a hex string representation of the value
@@ -136,7 +136,7 @@ class Text extends String {
      * @description Returns the string representation of the value
      */
     toString() {
-        return this.__internal__override || super.toString();
+        return this.#override || super.toString();
     }
     /**
      * @description Encodes the value as a Uint8Array as per the SCALE specifications

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@polkadot/types-codec', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.2.1' };
+exports.packageInfo = { name: '@polkadot/types-codec', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '16.3.1' };

package/cjs/utils/decodeU8a.js

@@ -4,6 +4,12 @@ exports.decodeU8a = decodeU8a;
 exports.decodeU8aStruct = decodeU8aStruct;
 exports.decodeU8aVec = decodeU8aVec;
 const util_1 = require("@polkadot/util");
+const MAX_DEPTH = 1024;
+/** @internal */
+function isComplexType(Type) {
+    const typeName = Type.name?.toLowerCase() || '';
+    return ['enum', 'hashmap', 'linkage', 'null', 'option', 'range', 'rangeinclusive', 'result', 'struct', 'tuple', 'vec', 'vecfixed'].includes(typeName);
+}
 /** @internal */
 function formatFailure(registry, fn, _result, { message }, u8a, i, count, Type, key) {
     let type = '';
@@ -55,6 +61,9 @@ function decodeU8aStruct(registry, result, u8a, [Types, keys]) {
     const count = result.length;
     let offset = 0;
     let i = 0;
+    if (count > MAX_DEPTH && isComplexType(Types[i])) {
+        throw new Error(`decodeU8aStruct: Maximum depth exceeded, received ${count} elements, limit ${MAX_DEPTH}`);
+    }
     try {
         while (i < count) {
             const value = new Types[i](registry, u8a.subarray(offset));
@@ -76,6 +85,9 @@ function decodeU8aStruct(registry, result, u8a, [Types, keys]) {
  */
 function decodeU8aVec(registry, result, u8a, startAt, Type) {
     const count = result.length;
+    if (count > MAX_DEPTH && isComplexType(Type)) {
+        throw new Error(`decodeU8aVec: Maximum depth exceeded, received ${count} elements, limit ${MAX_DEPTH}`);
+    }
     let offset = startAt;
     let i = 0;
     try {

package/extended/BTreeSet.js

@@ -58,13 +58,13 @@ export class BTreeSet extends Set {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__ValClass;
+    #ValClass;
     constructor(registry, valType, rawValue) {
         const [ValClass, values, decodedLength] = decodeSet(registry, valType, rawValue);
         super(sortSet(values));
         this.registry = registry;
         this.initialU8aLength = decodedLength;
-        this.__internal__ValClass = ValClass;
+        this.#ValClass = ValClass;
     }
     static with(valType) {
         return class extends BTreeSet {
@@ -150,7 +150,7 @@ export class BTreeSet extends Set {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return `BTreeSet<${this.registry.getClassName(this.__internal__ValClass) || new this.__internal__ValClass(this.registry).toRawType()}>`;
+        return `BTreeSet<${this.registry.getClassName(this.#ValClass) || new this.#ValClass(this.registry).toRawType()}>`;
     }
     /**
      * @description Converts the value in a best-fit primitive form

package/extended/BitVec.js

@@ -28,29 +28,29 @@ function decodeBitVec(value) {
  * and a normal Bytes would be that the length prefix indicates the number of bits encoded, not the bytes
  */
 export class BitVec extends Raw {
-    __internal__decodedLength;
-    __internal__isMsb;
+    #decodedLength;
+    #isMsb;
     // In lieu of having the Msb/Lsb identifiers passed through, we default to assuming
     // we are dealing with Lsb, which is the default (as of writing) BitVec format used
     // in the Polkadot code (this only affects the toHuman displays)
     constructor(registry, value, isMsb = false) {
         const [decodedLength, u8a] = decodeBitVec(value);
         super(registry, u8a);
-        this.__internal__decodedLength = decodedLength;
-        this.__internal__isMsb = isMsb;
+        this.#decodedLength = decodedLength;
+        this.#isMsb = isMsb;
     }
     /**
      * @description The length of the value when encoded as a Uint8Array
      */
     get encodedLength() {
-        return this.length + compactToU8a(this.__internal__decodedLength).length;
+        return this.length + compactToU8a(this.#decodedLength).length;
     }
     /**
      * @description Returns a breakdown of the hex encoding for this Codec
      */
     inspect() {
         return {
-            outer: [compactToU8a(this.__internal__decodedLength), super.toU8a()]
+            outer: [compactToU8a(this.#decodedLength), super.toU8a()]
         };
     }
     /**
@@ -73,7 +73,7 @@ export class BitVec extends Raw {
             const off = i * 8;
             const v = map[i];
             for (let j = 0; j < 8; j++) {
-                result[off + j] = this.__internal__isMsb
+                result[off + j] = this.#isMsb
                     ? v[j]
                     : v[7 - j];
             }
@@ -86,7 +86,7 @@ export class BitVec extends Raw {
     toHuman() {
         return `0b${[...this.toU8a(true)]
             .map((d) => `00000000${d.toString(2)}`.slice(-8))
-            .map((s) => this.__internal__isMsb ? s : s.split('').reverse().join(''))
+            .map((s) => this.#isMsb ? s : s.split('').reverse().join(''))
             .join('_')}`;
     }
     /**
@@ -103,6 +103,6 @@ export class BitVec extends Raw {
         const bitVec = super.toU8a(isBare);
         return isBare
             ? bitVec
-            : u8aConcatStrict([compactToU8a(this.__internal__decodedLength), bitVec]);
+            : u8aConcatStrict([compactToU8a(this.#decodedLength), bitVec]);
     }
 }

package/extended/Map.js

@@ -77,17 +77,17 @@ export class CodecMap extends Map {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__KeyClass;
-    __internal__ValClass;
-    __internal__type;
+    #KeyClass;
+    #ValClass;
+    #type;
     constructor(registry, keyType, valType, rawValue, type = 'HashMap') {
         const [KeyClass, ValClass, decoded, decodedLength] = decodeMap(registry, keyType, valType, rawValue);
         super(type === 'BTreeMap' ? sortMap(decoded) : decoded);
         this.registry = registry;
         this.initialU8aLength = decodedLength;
-        this.__internal__KeyClass = KeyClass;
-        this.__internal__ValClass = ValClass;
-        this.__internal__type = type;
+        this.#KeyClass = KeyClass;
+        this.#ValClass = ValClass;
+        this.#type = type;
     }
     /**
      * @description The length of the value when encoded as a Uint8Array
@@ -175,7 +175,7 @@ export class CodecMap extends Map {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return `${this.__internal__type}<${this.registry.getClassName(this.__internal__KeyClass) || new this.__internal__KeyClass(this.registry).toRawType()},${this.registry.getClassName(this.__internal__ValClass) || new this.__internal__ValClass(this.registry).toRawType()}>`;
+        return `${this.#type}<${this.registry.getClassName(this.#KeyClass) || new this.#KeyClass(this.registry).toRawType()},${this.registry.getClassName(this.#ValClass) || new this.#ValClass(this.registry).toRawType()}>`;
     }
     /**
      * @description Returns the string representation of the value

package/extended/Range.js

@@ -5,10 +5,10 @@ import { Tuple } from '../base/Tuple.js';
  * Rust `Range<T>` representation
  */
 export class Range extends Tuple {
-    __internal__rangeName;
+    #rangeName;
     constructor(registry, Type, value, { rangeName = 'Range' } = {}) {
         super(registry, [Type, Type], value);
-        this.__internal__rangeName = rangeName;
+        this.#rangeName = rangeName;
     }
     static with(Type) {
         return class extends Range {
@@ -33,6 +33,6 @@ export class Range extends Tuple {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return `${this.__internal__rangeName}<${this.start.toRawType()}>`;
+        return `${this.#rangeName}<${this.start.toRawType()}>`;
     }
 }

package/extended/WrapperKeepOpaque.js

@@ -21,15 +21,15 @@ function decodeRaw(registry, typeName, value) {
     return [Type, instance, compactAddLength(instance.toU8a())];
 }
 export class WrapperKeepOpaque extends Bytes {
-    __internal__Type;
-    __internal__decoded;
-    __internal__opaqueName;
+    #Type;
+    #decoded;
+    #opaqueName;
     constructor(registry, typeName, value, { opaqueName = 'WrapperKeepOpaque' } = {}) {
         const [Type, decoded, u8a] = decodeRaw(registry, typeName, value);
         super(registry, u8a);
-        this.__internal__Type = Type;
-        this.__internal__decoded = decoded;
-        this.__internal__opaqueName = opaqueName;
+        this.#Type = Type;
+        this.#decoded = decoded;
+        this.#opaqueName = opaqueName;
     }
     static with(Type) {
         return class extends WrapperKeepOpaque {
@@ -42,15 +42,15 @@ export class WrapperKeepOpaque extends Bytes {
      * @description Checks if the wrapper is decodable
      */
     get isDecoded() {
-        return !!this.__internal__decoded;
+        return !!this.#decoded;
     }
     /**
      * @description Returns a breakdown of the hex encoding for this Codec
      */
     inspect() {
-        return this.__internal__decoded
+        return this.#decoded
             ? {
-                inner: [this.__internal__decoded.inspect()],
+                inner: [this.#decoded.inspect()],
                 outer: [compactToU8a(this.length)]
             }
             : {
@@ -61,39 +61,39 @@ export class WrapperKeepOpaque extends Bytes {
      * @description Converts the Object to to a human-friendly JSON, with additional fields, expansion and formatting of information
      */
     toHuman(isExtended, disableAscii) {
-        return this.__internal__decoded
-            ? this.__internal__decoded.toHuman(isExtended, disableAscii)
+        return this.#decoded
+            ? this.#decoded.toHuman(isExtended, disableAscii)
             : super.toHuman(isExtended, disableAscii);
     }
     /**
      * @description Converts the value in a best-fit primitive form
      */
     toPrimitive(disableAscii) {
-        return this.__internal__decoded
-            ? this.__internal__decoded.toPrimitive(disableAscii)
+        return this.#decoded
+            ? this.#decoded.toPrimitive(disableAscii)
             : super.toPrimitive(disableAscii);
     }
     /**
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return `${this.__internal__opaqueName}<${this.registry.getClassName(this.__internal__Type) || (this.__internal__decoded ? this.__internal__decoded.toRawType() : new this.__internal__Type(this.registry).toRawType())}>`;
+        return `${this.#opaqueName}<${this.registry.getClassName(this.#Type) || (this.#decoded ? this.#decoded.toRawType() : new this.#Type(this.registry).toRawType())}>`;
     }
     /**
      * @description Converts the Object to to a string (either decoded or bytes)
      */
     toString() {
-        return this.__internal__decoded
-            ? this.__internal__decoded.toString()
+        return this.#decoded
+            ? this.#decoded.toString()
             : super.toString();
     }
     /**
      * @description Returns the decoded that the WrapperKeepOpaque represents (if available), throws if non-decodable
      */
     unwrap() {
-        if (!this.__internal__decoded) {
-            throw new Error(`${this.__internal__opaqueName}: unwrapping an undecodable value`);
+        if (!this.#decoded) {
+            throw new Error(`${this.#opaqueName}: unwrapping an undecodable value`);
         }
-        return this.__internal__decoded;
+        return this.#decoded;
     }
 }

package/native/Float.js

@@ -13,14 +13,14 @@ export class Float extends Number {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__bitLength;
+    #bitLength;
     constructor(registry, value, { bitLength = 32 } = {}) {
         super(isU8a(value) || isHex(value)
             ? value.length === 0
                 ? 0
                 : u8aToFloat(u8aToU8a(value), { bitLength })
             : (value || 0));
-        this.__internal__bitLength = bitLength;
+        this.#bitLength = bitLength;
         this.encodedLength = bitLength / 8;
         this.initialU8aLength = this.encodedLength;
         this.registry = registry;
@@ -94,14 +94,14 @@ export class Float extends Number {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return `f${this.__internal__bitLength}`;
+        return `f${this.#bitLength}`;
     }
     /**
      * @description Encodes the value as a Uint8Array as per the SCALE specifications
      */
     toU8a(_isBare) {
         return floatToU8a(this, {
-            bitLength: this.__internal__bitLength
+            bitLength: this.#bitLength
         });
     }
 }

package/native/Set.js

@@ -70,13 +70,13 @@ export class CodecSet extends Set {
     createdAtHash;
     initialU8aLength;
     isStorageFallback;
-    __internal__allowed;
-    __internal__byteLength;
+    #allowed;
+    #byteLength;
     constructor(registry, setValues, value, bitLength = 8) {
         super(decodeSet(setValues, value, bitLength));
         this.registry = registry;
-        this.__internal__allowed = setValues;
-        this.__internal__byteLength = bitLength / 8;
+        this.#allowed = setValues;
+        this.#byteLength = bitLength / 8;
     }
     static with(values, bitLength) {
         return class extends CodecSet {
@@ -98,7 +98,7 @@ export class CodecSet extends Set {
      * @description The length of the value when encoded as a Uint8Array
      */
     get encodedLength() {
-        return this.__internal__byteLength;
+        return this.#byteLength;
     }
     /**
      * @description returns a hash of the contents
@@ -122,7 +122,7 @@ export class CodecSet extends Set {
      * @description The encoded value for the set members
      */
     get valueEncoded() {
-        return encodeSet(this.__internal__allowed, this.strings);
+        return encodeSet(this.#allowed, this.strings);
     }
     /**
      * @description adds a value to the Set (extended to allow for validity checking)
@@ -131,7 +131,7 @@ export class CodecSet extends Set {
         // ^^^ add = () property done to assign this instance's this, otherwise Set.add creates "some" chaos
         // we have the isUndefined(this._setValues) in here as well, add is used internally
         // in the Set constructor (so it is undefined at this point, and should allow)
-        if (this.__internal__allowed && isUndefined(this.__internal__allowed[key])) {
+        if (this.#allowed && isUndefined(this.#allowed[key])) {
             throw new Error(`Set: Invalid key '${key}' on add`);
         }
         super.add(key);
@@ -195,7 +195,7 @@ export class CodecSet extends Set {
      * @description Returns the base runtime type name for this instance
      */
     toRawType() {
-        return stringify({ _set: this.__internal__allowed });
+        return stringify({ _set: this.#allowed });
     }
     /**
      * @description Returns the string representation of the value
@@ -208,7 +208,7 @@ export class CodecSet extends Set {
      */
     toU8a(_isBare) {
         return bnToU8a(this.valueEncoded, {
-            bitLength: this.__internal__byteLength * 8,
+            bitLength: this.#byteLength * 8,
             isLe: true
         });
     }