bitbadgesjs-sdk 0.3.35 → 0.3.36

package/dist/core/permissions.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserPermissionsWithDetails = exports.CollectionPermissionsWithDetails = exports.UserOutgoingApprovalPermissionWithDetails = exports.UserIncomingApprovalPermissionWithDetails = exports.CollectionApprovalPermissionWithDetails = exports.CollectionApprovalPermission = exports.TimedUpdateWithBadgeIdsPermission = exports.BalancesActionPermission = exports.TimedUpdatePermission = exports.ActionPermission = exports.CollectionPermissions = exports.UserIncomingApprovalPermission = exports.UserOutgoingApprovalPermission = exports.UserPermissions = void 0;
-const base_1 = require("../common/base");
-const proto_1 = require("../proto");
-const addressLists_1 = require("./addressLists");
-const overlaps_1 = require("./overlaps");
-const string_numbers_1 = require("../common/string-numbers");
-const uintRanges_1 = require("./uintRanges");
-const validate_utils_1 = require("./validate-utils");
-class UserPermissions extends base_1.BaseNumberTypeClass {
+import { BaseNumberTypeClass, convertClassPropertiesAndMaintainNumberTypes, deepCopyPrimitives } from '../common/base';
+import { badges } from '../proto';
+import { AddressList } from './addressLists';
+import { GetFirstMatchOnly, getOverlapsAndNonOverlaps, universalRemoveOverlaps } from './overlaps';
+import { BigIntify, Stringify } from '../common/string-numbers';
+import { UintRange, UintRangeArray } from './uintRanges';
+import { AllDefaultValues } from './validate-utils';
+export class UserPermissions extends BaseNumberTypeClass {
     canUpdateOutgoingApprovals;
     canUpdateIncomingApprovals;
     canUpdateAutoApproveSelfInitiatedOutgoingTransfers;
@@ -21,16 +18,16 @@ class UserPermissions extends base_1.BaseNumberTypeClass {
         this.canUpdateAutoApproveSelfInitiatedIncomingTransfers = msg.canUpdateAutoApproveSelfInitiatedIncomingTransfers.map((x) => new ActionPermission(x));
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     toProto() {
-        return new proto_1.badges.UserPermissions(this.convert(string_numbers_1.Stringify));
+        return new badges.UserPermissions(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return UserPermissions.fromProto(proto_1.badges.UserPermissions.fromJson(jsonValue, options), convertFunction);
+        return UserPermissions.fromProto(badges.UserPermissions.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return UserPermissions.fromProto(proto_1.badges.UserPermissions.fromJsonString(jsonString, options), convertFunction);
+        return UserPermissions.fromProto(badges.UserPermissions.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new UserPermissions({
@@ -58,8 +55,7 @@ class UserPermissions extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.UserPermissions = UserPermissions;
-class UserOutgoingApprovalPermission extends base_1.BaseNumberTypeClass {
+export class UserOutgoingApprovalPermission extends BaseNumberTypeClass {
     toListId;
     initiatedByListId;
     transferTimes;
@@ -72,35 +68,35 @@ class UserOutgoingApprovalPermission extends base_1.BaseNumberTypeClass {
         super();
         this.toListId = msg.toListId;
         this.initiatedByListId = msg.initiatedByListId;
-        this.transferTimes = uintRanges_1.UintRangeArray.From(msg.transferTimes);
-        this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
-        this.ownershipTimes = uintRanges_1.UintRangeArray.From(msg.ownershipTimes);
+        this.transferTimes = UintRangeArray.From(msg.transferTimes);
+        this.badgeIds = UintRangeArray.From(msg.badgeIds);
+        this.ownershipTimes = UintRangeArray.From(msg.ownershipTimes);
         this.approvalId = msg.approvalId;
-        this.permanentlyPermittedTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyPermittedTimes);
-        this.permanentlyForbiddenTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyForbiddenTimes);
+        this.permanentlyPermittedTimes = UintRangeArray.From(msg.permanentlyPermittedTimes);
+        this.permanentlyForbiddenTimes = UintRangeArray.From(msg.permanentlyForbiddenTimes);
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     toProto() {
-        return new proto_1.badges.UserOutgoingApprovalPermission(this.convert(string_numbers_1.Stringify));
+        return new badges.UserOutgoingApprovalPermission(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return UserOutgoingApprovalPermission.fromProto(proto_1.badges.UserOutgoingApprovalPermission.fromJson(jsonValue, options), convertFunction);
+        return UserOutgoingApprovalPermission.fromProto(badges.UserOutgoingApprovalPermission.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return UserOutgoingApprovalPermission.fromProto(proto_1.badges.UserOutgoingApprovalPermission.fromJsonString(jsonString, options), convertFunction);
+        return UserOutgoingApprovalPermission.fromProto(badges.UserOutgoingApprovalPermission.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new UserOutgoingApprovalPermission({
             toListId: protoMsg.toListId,
             initiatedByListId: protoMsg.initiatedByListId,
-            transferTimes: protoMsg.transferTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            badgeIds: protoMsg.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            ownershipTimes: protoMsg.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
+            transferTimes: protoMsg.transferTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            badgeIds: protoMsg.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            ownershipTimes: protoMsg.ownershipTimes.map((x) => UintRange.fromProto(x, convertFunction)),
             approvalId: protoMsg.approvalId,
-            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction))
+            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => UintRange.fromProto(x, convertFunction))
         });
     }
     castToCollectionApprovalPermission(address) {
@@ -114,15 +110,14 @@ class UserOutgoingApprovalPermission extends base_1.BaseNumberTypeClass {
         const dummyAddress = '0x';
         const castedPermissions = permissions.map((x) => x.castToCollectionApprovalPermission(dummyAddress).castToUniversalPermission());
         const castedNewPermissions = newPermission.map((x) => x.castToCollectionApprovalPermission(dummyAddress).castToUniversalPermission());
-        return validateUniversalPermissionUpdate((0, overlaps_1.GetFirstMatchOnly)(castedPermissions), (0, overlaps_1.GetFirstMatchOnly)(castedNewPermissions));
+        return validateUniversalPermissionUpdate(GetFirstMatchOnly(castedPermissions), GetFirstMatchOnly(castedNewPermissions));
     }
     static check(details, permissions, time) {
         const dummyAddress = '0x';
         return CollectionApprovalPermission.check(details, permissions.map((x) => x.castToCollectionApprovalPermission(dummyAddress)), time);
     }
 }
-exports.UserOutgoingApprovalPermission = UserOutgoingApprovalPermission;
-class UserIncomingApprovalPermission extends base_1.BaseNumberTypeClass {
+export class UserIncomingApprovalPermission extends BaseNumberTypeClass {
     fromListId;
     initiatedByListId;
     transferTimes;
@@ -136,35 +131,35 @@ class UserIncomingApprovalPermission extends base_1.BaseNumberTypeClass {
         this.fromListId = msg.fromListId;
         this.initiatedByListId = msg.initiatedByListId;
         this.approvalId = msg.approvalId;
-        this.transferTimes = uintRanges_1.UintRangeArray.From(msg.transferTimes);
-        this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
-        this.ownershipTimes = uintRanges_1.UintRangeArray.From(msg.ownershipTimes);
+        this.transferTimes = UintRangeArray.From(msg.transferTimes);
+        this.badgeIds = UintRangeArray.From(msg.badgeIds);
+        this.ownershipTimes = UintRangeArray.From(msg.ownershipTimes);
         this.approvalId = msg.approvalId;
-        this.permanentlyPermittedTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyPermittedTimes);
-        this.permanentlyForbiddenTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyForbiddenTimes);
+        this.permanentlyPermittedTimes = UintRangeArray.From(msg.permanentlyPermittedTimes);
+        this.permanentlyForbiddenTimes = UintRangeArray.From(msg.permanentlyForbiddenTimes);
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     toProto() {
-        return new proto_1.badges.UserIncomingApprovalPermission(this.convert(string_numbers_1.Stringify));
+        return new badges.UserIncomingApprovalPermission(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return UserIncomingApprovalPermission.fromProto(proto_1.badges.UserIncomingApprovalPermission.fromJson(jsonValue, options), convertFunction);
+        return UserIncomingApprovalPermission.fromProto(badges.UserIncomingApprovalPermission.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return UserIncomingApprovalPermission.fromProto(proto_1.badges.UserIncomingApprovalPermission.fromJsonString(jsonString, options), convertFunction);
+        return UserIncomingApprovalPermission.fromProto(badges.UserIncomingApprovalPermission.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new UserIncomingApprovalPermission({
             fromListId: protoMsg.fromListId,
             initiatedByListId: protoMsg.initiatedByListId,
-            transferTimes: protoMsg.transferTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            badgeIds: protoMsg.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            ownershipTimes: protoMsg.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
+            transferTimes: protoMsg.transferTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            badgeIds: protoMsg.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            ownershipTimes: protoMsg.ownershipTimes.map((x) => UintRange.fromProto(x, convertFunction)),
             approvalId: protoMsg.approvalId,
-            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction))
+            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => UintRange.fromProto(x, convertFunction))
         });
     }
     castToCollectionApprovalPermission(address) {
@@ -178,15 +173,14 @@ class UserIncomingApprovalPermission extends base_1.BaseNumberTypeClass {
         const dummyAddress = '0x';
         const castedPermissions = permissions.map((x) => x.castToCollectionApprovalPermission(dummyAddress).castToUniversalPermission());
         const castedNewPermissions = newPermission.map((x) => x.castToCollectionApprovalPermission(dummyAddress).castToUniversalPermission());
-        return validateUniversalPermissionUpdate((0, overlaps_1.GetFirstMatchOnly)(castedPermissions), (0, overlaps_1.GetFirstMatchOnly)(castedNewPermissions));
+        return validateUniversalPermissionUpdate(GetFirstMatchOnly(castedPermissions), GetFirstMatchOnly(castedNewPermissions));
     }
     static check(details, permissions, time) {
         const dummyAddress = '0x';
         return CollectionApprovalPermission.check(details, permissions.map((x) => x.castToCollectionApprovalPermission(dummyAddress)), time);
     }
 }
-exports.UserIncomingApprovalPermission = UserIncomingApprovalPermission;
-class CollectionPermissions extends base_1.BaseNumberTypeClass {
+export class CollectionPermissions extends BaseNumberTypeClass {
     canDeleteCollection;
     canArchiveCollection;
     canUpdateOffChainBalancesMetadata;
@@ -211,7 +205,7 @@ class CollectionPermissions extends base_1.BaseNumberTypeClass {
         this.canUpdateCollectionApprovals = msg.canUpdateCollectionApprovals.map((x) => new CollectionApprovalPermission(x));
     }
     convert(convertFunction) {
-        return new CollectionPermissions((0, base_1.deepCopyPrimitives)({
+        return new CollectionPermissions(deepCopyPrimitives({
             canDeleteCollection: this.canDeleteCollection.map((x) => x.convert(convertFunction)),
             canArchiveCollection: this.canArchiveCollection.map((x) => x.convert(convertFunction)),
             canUpdateOffChainBalancesMetadata: this.canUpdateOffChainBalancesMetadata.map((x) => x.convert(convertFunction)),
@@ -225,13 +219,13 @@ class CollectionPermissions extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto_1.badges.CollectionPermissions(this.convert(string_numbers_1.Stringify));
+        return new badges.CollectionPermissions(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return CollectionPermissions.fromProto(proto_1.badges.CollectionPermissions.fromJson(jsonValue, options), convertFunction);
+        return CollectionPermissions.fromProto(badges.CollectionPermissions.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return CollectionPermissions.fromProto(proto_1.badges.CollectionPermissions.fromJsonString(jsonString, options), convertFunction);
+        return CollectionPermissions.fromProto(badges.CollectionPermissions.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new CollectionPermissions({
@@ -277,56 +271,54 @@ class CollectionPermissions extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.CollectionPermissions = CollectionPermissions;
-class ActionPermission extends base_1.BaseNumberTypeClass {
+export class ActionPermission extends BaseNumberTypeClass {
     permanentlyPermittedTimes;
     permanentlyForbiddenTimes;
     constructor(msg) {
         super();
-        this.permanentlyPermittedTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyPermittedTimes);
-        this.permanentlyForbiddenTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyForbiddenTimes);
+        this.permanentlyPermittedTimes = UintRangeArray.From(msg.permanentlyPermittedTimes);
+        this.permanentlyForbiddenTimes = UintRangeArray.From(msg.permanentlyForbiddenTimes);
     }
     convert(convertFunction) {
-        return new ActionPermission((0, base_1.deepCopyPrimitives)({
+        return new ActionPermission(deepCopyPrimitives({
             permanentlyPermittedTimes: this.permanentlyPermittedTimes.map((x) => x.convert(convertFunction)),
             permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.map((x) => x.convert(convertFunction))
         }));
     }
     toProto() {
-        return new proto_1.badges.ActionPermission(this.convert(string_numbers_1.Stringify));
+        return new badges.ActionPermission(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return ActionPermission.fromProto(proto_1.badges.ActionPermission.fromJson(jsonValue, options), convertFunction);
+        return ActionPermission.fromProto(badges.ActionPermission.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return ActionPermission.fromProto(proto_1.badges.ActionPermission.fromJsonString(jsonString, options), convertFunction);
+        return ActionPermission.fromProto(badges.ActionPermission.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new ActionPermission({
-            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction))
+            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => UintRange.fromProto(x, convertFunction))
         });
     }
     castToUniversalPermission() {
         return {
-            ...validate_utils_1.AllDefaultValues,
-            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(string_numbers_1.BigIntify),
-            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(string_numbers_1.BigIntify)
+            ...AllDefaultValues,
+            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(BigIntify),
+            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(BigIntify)
         };
     }
     static validateUpdate(permissions, newPermission) {
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
         const castedNewPermissions = newPermission.map((x) => x.castToUniversalPermission());
-        return validateUniversalPermissionUpdate((0, overlaps_1.GetFirstMatchOnly)(castedPermissions), (0, overlaps_1.GetFirstMatchOnly)(castedNewPermissions));
+        return validateUniversalPermissionUpdate(GetFirstMatchOnly(castedPermissions), GetFirstMatchOnly(castedNewPermissions));
     }
     static check(permissions, time) {
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
         return checkUniversalPermissionPermits(castedPermissions, time);
     }
 }
-exports.ActionPermission = ActionPermission;
 function checkUniversalPermissionPermits(permissions, time) {
-    const permissionDetails = (0, overlaps_1.GetFirstMatchOnly)(permissions);
+    const permissionDetails = GetFirstMatchOnly(permissions);
     for (const permissionDetail of permissionDetails) {
         const err = checkNotForbidden(permissionDetail, time ? BigInt(time) : undefined);
         if (err) {
@@ -335,75 +327,74 @@ function checkUniversalPermissionPermits(permissions, time) {
     }
     return null;
 }
-class TimedUpdatePermission extends base_1.BaseNumberTypeClass {
+export class TimedUpdatePermission extends BaseNumberTypeClass {
     timelineTimes;
     permanentlyPermittedTimes;
     permanentlyForbiddenTimes;
     constructor(msg) {
         super();
-        this.timelineTimes = uintRanges_1.UintRangeArray.From(msg.timelineTimes);
-        this.permanentlyPermittedTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyPermittedTimes);
-        this.permanentlyForbiddenTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyForbiddenTimes);
+        this.timelineTimes = UintRangeArray.From(msg.timelineTimes);
+        this.permanentlyPermittedTimes = UintRangeArray.From(msg.permanentlyPermittedTimes);
+        this.permanentlyForbiddenTimes = UintRangeArray.From(msg.permanentlyForbiddenTimes);
     }
     convert(convertFunction) {
-        return new TimedUpdatePermission((0, base_1.deepCopyPrimitives)({
+        return new TimedUpdatePermission(deepCopyPrimitives({
             timelineTimes: this.timelineTimes.map((x) => x.convert(convertFunction)),
             permanentlyPermittedTimes: this.permanentlyPermittedTimes.map((x) => x.convert(convertFunction)),
             permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.map((x) => x.convert(convertFunction))
         }));
     }
     toProto() {
-        return new proto_1.badges.TimedUpdatePermission(this.convert(string_numbers_1.Stringify));
+        return new badges.TimedUpdatePermission(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return TimedUpdatePermission.fromProto(proto_1.badges.TimedUpdatePermission.fromJson(jsonValue, options), convertFunction);
+        return TimedUpdatePermission.fromProto(badges.TimedUpdatePermission.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return TimedUpdatePermission.fromProto(proto_1.badges.TimedUpdatePermission.fromJsonString(jsonString, options), convertFunction);
+        return TimedUpdatePermission.fromProto(badges.TimedUpdatePermission.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new TimedUpdatePermission({
-            timelineTimes: protoMsg.timelineTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction))
+            timelineTimes: protoMsg.timelineTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => UintRange.fromProto(x, convertFunction))
         });
     }
     castToUniversalPermission() {
         return {
-            ...validate_utils_1.AllDefaultValues,
-            timelineTimes: this.timelineTimes.convert(string_numbers_1.BigIntify),
-            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(string_numbers_1.BigIntify),
-            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(string_numbers_1.BigIntify),
+            ...AllDefaultValues,
+            timelineTimes: this.timelineTimes.convert(BigIntify),
+            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(BigIntify),
+            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(BigIntify),
             usesTimelineTimes: true
         };
     }
     static validateUpdate(permissions, newPermission) {
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
         const castedNewPermissions = newPermission.map((x) => x.castToUniversalPermission());
-        return validateUniversalPermissionUpdate((0, overlaps_1.GetFirstMatchOnly)(castedPermissions), (0, overlaps_1.GetFirstMatchOnly)(castedNewPermissions));
+        return validateUniversalPermissionUpdate(GetFirstMatchOnly(castedPermissions), GetFirstMatchOnly(castedNewPermissions));
     }
     static check(timelineTimes, permissions, time) {
         const detailsToCheck = [];
         for (const timelineTime of timelineTimes) {
             detailsToCheck.push({
                 ...AllDefaultDetailsValues,
-                timelineTime: timelineTime.convert(string_numbers_1.BigIntify)
+                timelineTime: timelineTime.convert(BigIntify)
             });
         }
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
-        const permissionDetails = (0, overlaps_1.GetFirstMatchOnly)(castedPermissions);
+        const permissionDetails = GetFirstMatchOnly(castedPermissions);
         return checkNotForbiddenForAllOverlaps(permissionDetails, detailsToCheck, time ? BigInt(time) : undefined);
     }
 }
-exports.TimedUpdatePermission = TimedUpdatePermission;
 const AllDefaultDetailsValues = {
-    timelineTime: new uintRanges_1.UintRange({ start: -1n, end: -1n }),
-    badgeId: new uintRanges_1.UintRange({ start: -1n, end: -1n }),
-    ownershipTime: new uintRanges_1.UintRange({ start: -1n, end: -1n }),
-    transferTime: new uintRanges_1.UintRange({ start: -1n, end: -1n }),
-    toList: new addressLists_1.AddressList({ listId: 'All', addresses: [], whitelist: false, uri: '', customData: '', createdBy: '' }),
-    fromList: new addressLists_1.AddressList({ listId: 'All', addresses: [], whitelist: false, uri: '', customData: '', createdBy: '' }),
-    initiatedByList: new addressLists_1.AddressList({
+    timelineTime: new UintRange({ start: -1n, end: -1n }),
+    badgeId: new UintRange({ start: -1n, end: -1n }),
+    ownershipTime: new UintRange({ start: -1n, end: -1n }),
+    transferTime: new UintRange({ start: -1n, end: -1n }),
+    toList: new AddressList({ listId: 'All', addresses: [], whitelist: false, uri: '', customData: '', createdBy: '' }),
+    fromList: new AddressList({ listId: 'All', addresses: [], whitelist: false, uri: '', customData: '', createdBy: '' }),
+    initiatedByList: new AddressList({
         listId: 'All',
         addresses: [],
         whitelist: false,
@@ -411,7 +402,7 @@ const AllDefaultDetailsValues = {
         customData: '',
         createdBy: ''
     }),
-    approvalIdList: new addressLists_1.AddressList({
+    approvalIdList: new AddressList({
         listId: 'All',
         addresses: [],
         whitelist: false,
@@ -419,24 +410,24 @@ const AllDefaultDetailsValues = {
         customData: '',
         createdBy: ''
     }),
-    permanentlyPermittedTimes: uintRanges_1.UintRangeArray.From([]),
-    permanentlyForbiddenTimes: uintRanges_1.UintRangeArray.From([]),
+    permanentlyPermittedTimes: UintRangeArray.From([]),
+    permanentlyForbiddenTimes: UintRangeArray.From([]),
     arbitraryValue: undefined
 };
-class BalancesActionPermission extends base_1.BaseNumberTypeClass {
+export class BalancesActionPermission extends BaseNumberTypeClass {
     badgeIds;
     ownershipTimes;
     permanentlyPermittedTimes;
     permanentlyForbiddenTimes;
     constructor(msg) {
         super();
-        this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
-        this.ownershipTimes = uintRanges_1.UintRangeArray.From(msg.ownershipTimes);
-        this.permanentlyPermittedTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyPermittedTimes);
-        this.permanentlyForbiddenTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyForbiddenTimes);
+        this.badgeIds = UintRangeArray.From(msg.badgeIds);
+        this.ownershipTimes = UintRangeArray.From(msg.ownershipTimes);
+        this.permanentlyPermittedTimes = UintRangeArray.From(msg.permanentlyPermittedTimes);
+        this.permanentlyForbiddenTimes = UintRangeArray.From(msg.permanentlyForbiddenTimes);
     }
     convert(convertFunction) {
-        return new BalancesActionPermission((0, base_1.deepCopyPrimitives)({
+        return new BalancesActionPermission(deepCopyPrimitives({
             badgeIds: this.badgeIds.map((x) => x.convert(convertFunction)),
             ownershipTimes: this.ownershipTimes.map((x) => x.convert(convertFunction)),
             permanentlyPermittedTimes: this.permanentlyPermittedTimes.map((x) => x.convert(convertFunction)),
@@ -444,29 +435,29 @@ class BalancesActionPermission extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto_1.badges.BalancesActionPermission(this.convert(string_numbers_1.Stringify));
+        return new badges.BalancesActionPermission(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return BalancesActionPermission.fromProto(proto_1.badges.BalancesActionPermission.fromJson(jsonValue, options), convertFunction);
+        return BalancesActionPermission.fromProto(badges.BalancesActionPermission.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return BalancesActionPermission.fromProto(proto_1.badges.BalancesActionPermission.fromJsonString(jsonString, options), convertFunction);
+        return BalancesActionPermission.fromProto(badges.BalancesActionPermission.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new BalancesActionPermission({
-            badgeIds: protoMsg.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            ownershipTimes: protoMsg.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction))
+            badgeIds: protoMsg.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            ownershipTimes: protoMsg.ownershipTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => UintRange.fromProto(x, convertFunction))
         });
     }
     castToUniversalPermission() {
         return {
-            ...validate_utils_1.AllDefaultValues,
-            badgeIds: this.badgeIds.convert(string_numbers_1.BigIntify),
-            ownershipTimes: this.ownershipTimes.convert(string_numbers_1.BigIntify),
-            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(string_numbers_1.BigIntify),
-            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(string_numbers_1.BigIntify),
+            ...AllDefaultValues,
+            badgeIds: this.badgeIds.convert(BigIntify),
+            ownershipTimes: this.ownershipTimes.convert(BigIntify),
+            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(BigIntify),
+            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(BigIntify),
             usesBadgeIds: true,
             usesOwnershipTimes: true
         };
@@ -474,7 +465,7 @@ class BalancesActionPermission extends base_1.BaseNumberTypeClass {
     static validateUpdate(permissions, newPermission) {
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
         const castedNewPermissions = newPermission.map((x) => x.castToUniversalPermission());
-        return validateUniversalPermissionUpdate((0, overlaps_1.GetFirstMatchOnly)(castedPermissions), (0, overlaps_1.GetFirstMatchOnly)(castedNewPermissions));
+        return validateUniversalPermissionUpdate(GetFirstMatchOnly(castedPermissions), GetFirstMatchOnly(castedNewPermissions));
     }
     static check(details, permissions, time) {
         const detailsToCheck = [];
@@ -483,32 +474,31 @@ class BalancesActionPermission extends base_1.BaseNumberTypeClass {
                 for (const badgeId of detail.badgeIds) {
                     detailsToCheck.push({
                         ...AllDefaultDetailsValues,
-                        ownershipTime: ownershipTime.convert(string_numbers_1.BigIntify),
-                        badgeId: badgeId.convert(string_numbers_1.BigIntify)
+                        ownershipTime: ownershipTime.convert(BigIntify),
+                        badgeId: badgeId.convert(BigIntify)
                     });
                 }
             }
         }
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
-        const permissionDetails = (0, overlaps_1.GetFirstMatchOnly)(castedPermissions);
+        const permissionDetails = GetFirstMatchOnly(castedPermissions);
         return checkNotForbiddenForAllOverlaps(permissionDetails, detailsToCheck, time ? BigInt(time) : undefined);
     }
 }
-exports.BalancesActionPermission = BalancesActionPermission;
-class TimedUpdateWithBadgeIdsPermission extends base_1.BaseNumberTypeClass {
+export class TimedUpdateWithBadgeIdsPermission extends BaseNumberTypeClass {
     timelineTimes;
     badgeIds;
     permanentlyPermittedTimes;
     permanentlyForbiddenTimes;
     constructor(msg) {
         super();
-        this.timelineTimes = uintRanges_1.UintRangeArray.From(msg.timelineTimes);
-        this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
-        this.permanentlyPermittedTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyPermittedTimes);
-        this.permanentlyForbiddenTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyForbiddenTimes);
+        this.timelineTimes = UintRangeArray.From(msg.timelineTimes);
+        this.badgeIds = UintRangeArray.From(msg.badgeIds);
+        this.permanentlyPermittedTimes = UintRangeArray.From(msg.permanentlyPermittedTimes);
+        this.permanentlyForbiddenTimes = UintRangeArray.From(msg.permanentlyForbiddenTimes);
     }
     convert(convertFunction) {
-        return new TimedUpdateWithBadgeIdsPermission((0, base_1.deepCopyPrimitives)({
+        return new TimedUpdateWithBadgeIdsPermission(deepCopyPrimitives({
             timelineTimes: this.timelineTimes.map((x) => x.convert(convertFunction)),
             badgeIds: this.badgeIds.map((x) => x.convert(convertFunction)),
             permanentlyPermittedTimes: this.permanentlyPermittedTimes.map((x) => x.convert(convertFunction)),
@@ -516,29 +506,29 @@ class TimedUpdateWithBadgeIdsPermission extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto_1.badges.TimedUpdateWithBadgeIdsPermission(this.convert(string_numbers_1.Stringify));
+        return new badges.TimedUpdateWithBadgeIdsPermission(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return TimedUpdateWithBadgeIdsPermission.fromProto(proto_1.badges.TimedUpdateWithBadgeIdsPermission.fromJson(jsonValue, options), convertFunction);
+        return TimedUpdateWithBadgeIdsPermission.fromProto(badges.TimedUpdateWithBadgeIdsPermission.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return TimedUpdateWithBadgeIdsPermission.fromProto(proto_1.badges.TimedUpdateWithBadgeIdsPermission.fromJsonString(jsonString, options), convertFunction);
+        return TimedUpdateWithBadgeIdsPermission.fromProto(badges.TimedUpdateWithBadgeIdsPermission.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new TimedUpdateWithBadgeIdsPermission({
-            timelineTimes: protoMsg.timelineTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            badgeIds: protoMsg.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction))
+            timelineTimes: protoMsg.timelineTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            badgeIds: protoMsg.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => UintRange.fromProto(x, convertFunction))
         });
     }
     castToUniversalPermission() {
         return {
-            ...validate_utils_1.AllDefaultValues,
-            timelineTimes: this.timelineTimes.convert(string_numbers_1.BigIntify),
-            badgeIds: this.badgeIds.convert(string_numbers_1.BigIntify),
-            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(string_numbers_1.BigIntify),
-            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(string_numbers_1.BigIntify),
+            ...AllDefaultValues,
+            timelineTimes: this.timelineTimes.convert(BigIntify),
+            badgeIds: this.badgeIds.convert(BigIntify),
+            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(BigIntify),
+            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(BigIntify),
             usesTimelineTimes: true,
             usesBadgeIds: true
         };
@@ -546,7 +536,7 @@ class TimedUpdateWithBadgeIdsPermission extends base_1.BaseNumberTypeClass {
     static validateUpdate(permissions, newPermission) {
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
         const castedNewPermissions = newPermission.map((x) => x.castToUniversalPermission());
-        return validateUniversalPermissionUpdate((0, overlaps_1.GetFirstMatchOnly)(castedPermissions), (0, overlaps_1.GetFirstMatchOnly)(castedNewPermissions));
+        return validateUniversalPermissionUpdate(GetFirstMatchOnly(castedPermissions), GetFirstMatchOnly(castedNewPermissions));
     }
     static check(details, permissions, time) {
         const detailsToCheck = [];
@@ -555,19 +545,18 @@ class TimedUpdateWithBadgeIdsPermission extends base_1.BaseNumberTypeClass {
                 for (const badgeId of detail.badgeIds) {
                     detailsToCheck.push({
                         ...AllDefaultDetailsValues,
-                        timelineTime: timelineTime.convert(string_numbers_1.BigIntify),
-                        badgeId: badgeId.convert(string_numbers_1.BigIntify)
+                        timelineTime: timelineTime.convert(BigIntify),
+                        badgeId: badgeId.convert(BigIntify)
                     });
                 }
             }
         }
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
-        const permissionDetails = (0, overlaps_1.GetFirstMatchOnly)(castedPermissions);
+        const permissionDetails = GetFirstMatchOnly(castedPermissions);
         return checkNotForbiddenForAllOverlaps(permissionDetails, detailsToCheck, time ? BigInt(time) : undefined);
     }
 }
-exports.TimedUpdateWithBadgeIdsPermission = TimedUpdateWithBadgeIdsPermission;
-class CollectionApprovalPermission extends base_1.BaseNumberTypeClass {
+export class CollectionApprovalPermission extends BaseNumberTypeClass {
     fromListId;
     toListId;
     initiatedByListId;
@@ -582,15 +571,15 @@ class CollectionApprovalPermission extends base_1.BaseNumberTypeClass {
         this.fromListId = msg.fromListId;
         this.toListId = msg.toListId;
         this.initiatedByListId = msg.initiatedByListId;
-        this.transferTimes = uintRanges_1.UintRangeArray.From(msg.transferTimes);
-        this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
-        this.ownershipTimes = uintRanges_1.UintRangeArray.From(msg.ownershipTimes);
+        this.transferTimes = UintRangeArray.From(msg.transferTimes);
+        this.badgeIds = UintRangeArray.From(msg.badgeIds);
+        this.ownershipTimes = UintRangeArray.From(msg.ownershipTimes);
         this.approvalId = msg.approvalId;
-        this.permanentlyPermittedTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyPermittedTimes);
-        this.permanentlyForbiddenTimes = uintRanges_1.UintRangeArray.From(msg.permanentlyForbiddenTimes);
+        this.permanentlyPermittedTimes = UintRangeArray.From(msg.permanentlyPermittedTimes);
+        this.permanentlyForbiddenTimes = UintRangeArray.From(msg.permanentlyForbiddenTimes);
     }
     convert(convertFunction) {
-        return new CollectionApprovalPermission((0, base_1.deepCopyPrimitives)({
+        return new CollectionApprovalPermission(deepCopyPrimitives({
             fromListId: this.fromListId,
             toListId: this.toListId,
             initiatedByListId: this.initiatedByListId,
@@ -603,31 +592,31 @@ class CollectionApprovalPermission extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto_1.badges.CollectionApprovalPermission(this.convert(string_numbers_1.Stringify));
+        return new badges.CollectionApprovalPermission(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return CollectionApprovalPermission.fromProto(proto_1.badges.CollectionApprovalPermission.fromJson(jsonValue, options), convertFunction);
+        return CollectionApprovalPermission.fromProto(badges.CollectionApprovalPermission.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return CollectionApprovalPermission.fromProto(proto_1.badges.CollectionApprovalPermission.fromJsonString(jsonString, options), convertFunction);
+        return CollectionApprovalPermission.fromProto(badges.CollectionApprovalPermission.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(protoMsg, convertFunction) {
         return new CollectionApprovalPermission({
             fromListId: protoMsg.fromListId,
             toListId: protoMsg.toListId,
             initiatedByListId: protoMsg.initiatedByListId,
-            transferTimes: protoMsg.transferTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            badgeIds: protoMsg.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            ownershipTimes: protoMsg.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
+            transferTimes: protoMsg.transferTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            badgeIds: protoMsg.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            ownershipTimes: protoMsg.ownershipTimes.map((x) => UintRange.fromProto(x, convertFunction)),
             approvalId: protoMsg.approvalId,
-            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction))
+            permanentlyPermittedTimes: protoMsg.permanentlyPermittedTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            permanentlyForbiddenTimes: protoMsg.permanentlyForbiddenTimes.map((x) => UintRange.fromProto(x, convertFunction))
         });
     }
     static validateUpdate(permissions, newPermission) {
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
         const castedNewPermissions = newPermission.map((x) => x.castToUniversalPermission());
-        return validateUniversalPermissionUpdate((0, overlaps_1.GetFirstMatchOnly)(castedPermissions), (0, overlaps_1.GetFirstMatchOnly)(castedNewPermissions));
+        return validateUniversalPermissionUpdate(GetFirstMatchOnly(castedPermissions), GetFirstMatchOnly(castedNewPermissions));
     }
     static check(details, permissions, time) {
         const detailsToCheck = [];
@@ -637,9 +626,9 @@ class CollectionApprovalPermission extends base_1.BaseNumberTypeClass {
                     for (const ownershipTime of detail.ownershipTimes) {
                         detailsToCheck.push({
                             ...AllDefaultDetailsValues,
-                            transferTime: transferTime.convert(string_numbers_1.BigIntify),
-                            badgeId: badgeId.convert(string_numbers_1.BigIntify),
-                            ownershipTime: ownershipTime.convert(string_numbers_1.BigIntify),
+                            transferTime: transferTime.convert(BigIntify),
+                            badgeId: badgeId.convert(BigIntify),
+                            ownershipTime: ownershipTime.convert(BigIntify),
                             toList: detail.toList,
                             fromList: detail.fromList,
                             initiatedByList: detail.initiatedByList,
@@ -650,37 +639,36 @@ class CollectionApprovalPermission extends base_1.BaseNumberTypeClass {
             }
         }
         const castedPermissions = permissions.map((x) => x.castToUniversalPermission());
-        const permissionDetails = (0, overlaps_1.GetFirstMatchOnly)(castedPermissions);
+        const permissionDetails = GetFirstMatchOnly(castedPermissions);
         return checkNotForbiddenForAllOverlaps(permissionDetails, detailsToCheck, time ? BigInt(time) : undefined, true);
     }
 }
-exports.CollectionApprovalPermission = CollectionApprovalPermission;
-const { getReservedAddressList, getReservedTrackerList } = addressLists_1.AddressList;
-class CollectionApprovalPermissionWithDetails extends CollectionApprovalPermission {
+const { getReservedAddressList, getReservedTrackerList } = AddressList;
+export class CollectionApprovalPermissionWithDetails extends CollectionApprovalPermission {
     toList;
     fromList;
     initiatedByList;
     constructor(data) {
         super(data);
-        this.toList = new addressLists_1.AddressList(data.toList);
-        this.fromList = new addressLists_1.AddressList(data.fromList);
-        this.initiatedByList = new addressLists_1.AddressList(data.initiatedByList);
+        this.toList = new AddressList(data.toList);
+        this.fromList = new AddressList(data.fromList);
+        this.initiatedByList = new AddressList(data.initiatedByList);
     }
     clone() {
         return super.clone();
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     castToUniversalPermission() {
         return {
-            ...validate_utils_1.AllDefaultValues,
+            ...AllDefaultValues,
             toList: this.toList,
             fromList: this.fromList,
             initiatedByList: this.initiatedByList,
-            transferTimes: this.transferTimes.convert(string_numbers_1.BigIntify),
-            badgeIds: this.badgeIds.convert(string_numbers_1.BigIntify),
-            ownershipTimes: this.ownershipTimes.convert(string_numbers_1.BigIntify),
+            transferTimes: this.transferTimes.convert(BigIntify),
+            badgeIds: this.badgeIds.convert(BigIntify),
+            ownershipTimes: this.ownershipTimes.convert(BigIntify),
             approvalIdList: getReservedTrackerList(this.approvalId),
             usesApprovalIdList: true,
             usesBadgeIds: true,
@@ -689,25 +677,24 @@ class CollectionApprovalPermissionWithDetails extends CollectionApprovalPermissi
             usesToList: true,
             usesFromList: true,
             usesInitiatedByList: true,
-            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(string_numbers_1.BigIntify),
-            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(string_numbers_1.BigIntify)
+            permanentlyPermittedTimes: this.permanentlyPermittedTimes.convert(BigIntify),
+            permanentlyForbiddenTimes: this.permanentlyForbiddenTimes.convert(BigIntify)
         };
     }
 }
-exports.CollectionApprovalPermissionWithDetails = CollectionApprovalPermissionWithDetails;
-class UserIncomingApprovalPermissionWithDetails extends UserIncomingApprovalPermission {
+export class UserIncomingApprovalPermissionWithDetails extends UserIncomingApprovalPermission {
     fromList;
     initiatedByList;
     constructor(data) {
         super(data);
-        this.fromList = new addressLists_1.AddressList(data.fromList);
-        this.initiatedByList = new addressLists_1.AddressList(data.initiatedByList);
+        this.fromList = new AddressList(data.fromList);
+        this.initiatedByList = new AddressList(data.initiatedByList);
     }
     clone() {
         return super.clone();
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     castToCollectionApprovalPermission(address) {
         return new CollectionApprovalPermissionWithDetails({
@@ -717,20 +704,19 @@ class UserIncomingApprovalPermissionWithDetails extends UserIncomingApprovalPerm
         });
     }
 }
-exports.UserIncomingApprovalPermissionWithDetails = UserIncomingApprovalPermissionWithDetails;
-class UserOutgoingApprovalPermissionWithDetails extends UserOutgoingApprovalPermission {
+export class UserOutgoingApprovalPermissionWithDetails extends UserOutgoingApprovalPermission {
     toList;
     initiatedByList;
     constructor(data) {
         super(data);
-        this.toList = new addressLists_1.AddressList(data.toList);
-        this.initiatedByList = new addressLists_1.AddressList(data.initiatedByList);
+        this.toList = new AddressList(data.toList);
+        this.initiatedByList = new AddressList(data.initiatedByList);
     }
     clone() {
         return super.clone();
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     castToCollectionApprovalPermission(address) {
         return new CollectionApprovalPermissionWithDetails({
@@ -740,15 +726,14 @@ class UserOutgoingApprovalPermissionWithDetails extends UserOutgoingApprovalPerm
         });
     }
 }
-exports.UserOutgoingApprovalPermissionWithDetails = UserOutgoingApprovalPermissionWithDetails;
-class CollectionPermissionsWithDetails extends CollectionPermissions {
+export class CollectionPermissionsWithDetails extends CollectionPermissions {
     canUpdateCollectionApprovals;
     constructor(data) {
         super(data);
         this.canUpdateCollectionApprovals = data.canUpdateCollectionApprovals.map((canUpdateCollectionApproval) => new CollectionApprovalPermissionWithDetails(canUpdateCollectionApproval));
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     clone() {
         return super.clone();
@@ -757,8 +742,7 @@ class CollectionPermissionsWithDetails extends CollectionPermissions {
         return CollectionPermissions.validateUpdate(oldPermissions, newPermissions);
     }
 }
-exports.CollectionPermissionsWithDetails = CollectionPermissionsWithDetails;
-class UserPermissionsWithDetails extends UserPermissions {
+export class UserPermissionsWithDetails extends UserPermissions {
     canUpdateIncomingApprovals;
     canUpdateOutgoingApprovals;
     canUpdateAutoApproveSelfInitiatedOutgoingTransfers;
@@ -771,10 +755,9 @@ class UserPermissionsWithDetails extends UserPermissions {
         this.canUpdateAutoApproveSelfInitiatedIncomingTransfers = data.canUpdateAutoApproveSelfInitiatedIncomingTransfers.map((actionPermission) => new ActionPermission(actionPermission));
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
 }
-exports.UserPermissionsWithDetails = UserPermissionsWithDetails;
 function checkNotForbidden(permission, time) {
     const blockTime = time ?? BigInt(Date.now());
     const [, found] = permission.permanentlyForbiddenTimes.search(blockTime);
@@ -797,40 +780,40 @@ function checkNotForbiddenForAllOverlaps(permissionDetails, detailsToCheck, time
     for (const detailToCheck of detailsToCheck) {
         if (detailToCheck.badgeId.start === -1n) {
             usesBadgeIds = false;
-            detailToCheck.badgeId = new uintRanges_1.UintRange({ start: BigInt(1n), end: BigInt(1n) });
+            detailToCheck.badgeId = new UintRange({ start: BigInt(1n), end: BigInt(1n) });
         }
         if (detailToCheck.timelineTime.start === -1n) {
             usesTimelineTimes = false;
-            detailToCheck.timelineTime = new uintRanges_1.UintRange({ start: BigInt(1n), end: BigInt(1n) });
+            detailToCheck.timelineTime = new UintRange({ start: BigInt(1n), end: BigInt(1n) });
         }
         if (detailToCheck.transferTime.start === -1n) {
             usesTransferTimes = false;
-            detailToCheck.transferTime = new uintRanges_1.UintRange({ start: BigInt(1n), end: BigInt(1n) });
+            detailToCheck.transferTime = new UintRange({ start: BigInt(1n), end: BigInt(1n) });
         }
         if (detailToCheck.ownershipTime.start === -1n) {
             usesOwnershipTimes = false;
-            detailToCheck.ownershipTime = new uintRanges_1.UintRange({ start: BigInt(1n), end: BigInt(1n) });
+            detailToCheck.ownershipTime = new UintRange({ start: BigInt(1n), end: BigInt(1n) });
         }
         if (!usesLists) {
             usesToLists = false;
-            detailToCheck.toList = addressLists_1.AddressList.AllAddresses();
+            detailToCheck.toList = AddressList.AllAddresses();
         }
         if (!usesLists) {
             usesFromLists = false;
-            detailToCheck.fromList = addressLists_1.AddressList.AllAddresses();
+            detailToCheck.fromList = AddressList.AllAddresses();
         }
         if (!usesLists) {
             usesInitiatedByLists = false;
-            detailToCheck.initiatedByList = addressLists_1.AddressList.AllAddresses();
+            detailToCheck.initiatedByList = AddressList.AllAddresses();
         }
         if (!usesLists) {
             usesApprovalIdLists = false;
-            detailToCheck.approvalIdList = addressLists_1.AddressList.AllAddresses();
+            detailToCheck.approvalIdList = AddressList.AllAddresses();
         }
     }
     for (const permissionDetail of permissionDetails) {
         for (const detailToCheck of detailsToCheck) {
-            const [, overlap] = (0, overlaps_1.universalRemoveOverlaps)(permissionDetail, detailToCheck);
+            const [, overlap] = universalRemoveOverlaps(permissionDetail, detailToCheck);
             if (overlap.length > 0) {
                 const err = checkNotForbidden(permissionDetail, time);
                 if (err) {
@@ -867,7 +850,7 @@ function checkNotForbiddenForAllOverlaps(permissionDetails, detailsToCheck, time
     return null;
 }
 function validateUniversalPermissionUpdate(oldPermissions, newPermissions) {
-    const [allOverlaps, inOldButNotNew] = (0, overlaps_1.getOverlapsAndNonOverlaps)(oldPermissions, newPermissions);
+    const [allOverlaps, inOldButNotNew] = getOverlapsAndNonOverlaps(oldPermissions, newPermissions);
     if (inOldButNotNew.length > 0) {
         let errMsg = `Permission ${getPermissionString(inOldButNotNew[0])} found in old permissions but not in new permissions`;
         if (inOldButNotNew.length > 1) {