bitbadgesjs-sdk 0.3.76 → 0.3.78

package/dist/core/approvals.js

@@ -1,41 +1,15 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expandCollectionApprovals = exports.validateCollectionApprovalsUpdate = exports.getFirstMatchOnlyWithApprovalCriteria = exports.CollectionApprovalWithDetails = exports.OutgoingApprovalCriteriaWithDetails = exports.IncomingApprovalCriteriaWithDetails = exports.ApprovalCriteriaWithDetails = exports.MerkleChallengeWithDetails = exports.ApprovalInfoDetails = exports.ChallengeInfoDetails = exports.ChallengeDetails = exports.UserIncomingApprovalWithDetails = exports.UserOutgoingApprovalWithDetails = exports.ApprovalCriteria = exports.CollectionApproval = exports.IncomingApprovalCriteria = exports.UserIncomingApproval = exports.MaxNumTransfers = exports.ApprovalAmounts = exports.PredeterminedOrderCalculationMethod = exports.IncrementedBalances = exports.ManualBalances = exports.PredeterminedBalances = exports.OutgoingApprovalCriteria = exports.UserOutgoingApproval = void 0;
-const base_1 = require("../common/base");
-const proto = __importStar(require("../proto"));
-const string_numbers_1 = require("../common/string-numbers");
-const addressLists_1 = require("./addressLists");
-const balances_1 = require("./balances");
-const misc_1 = require("./misc");
-const overlaps_1 = require("./overlaps");
-const permissions_1 = require("./permissions");
-const uintRanges_1 = require("./uintRanges");
-const validate_utils_1 = require("./validate-utils");
-const { getReservedAddressList, getReservedTrackerList } = addressLists_1.AddressList;
-class UserOutgoingApproval extends base_1.BaseNumberTypeClass {
+import { BaseNumberTypeClass, CustomTypeClass, convertClassPropertiesAndMaintainNumberTypes, deepCopyPrimitives } from '../common/base';
+import * as badges from '../proto/badges';
+import { BigIntify, Stringify } from '../common/string-numbers';
+import { AddressList } from './addressLists';
+import { Balance, BalanceArray } from './balances';
+import { CoinTransfer, MerkleChallenge, MustOwnBadges, ZkProof } from './misc';
+import { GetListIdWithOptions, GetListWithOptions, GetUintRangesWithOptions, getOverlapsAndNonOverlaps } from './overlaps';
+import { CollectionApprovalPermission } from './permissions';
+import { UintRange, UintRangeArray } from './uintRanges';
+import { AllDefaultValues, getPotentialUpdatesForTimelineValues, getUpdateCombinationsToCheck } from './validate-utils';
+const { getReservedAddressList, getReservedTrackerList } = AddressList;
+export class UserOutgoingApproval extends BaseNumberTypeClass {
     toListId;
     initiatedByListId;
     transferTimes;
@@ -49,33 +23,33 @@ class UserOutgoingApproval 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.uri = msg.uri;
         this.customData = msg.customData;
         this.approvalCriteria = msg.approvalCriteria ? new OutgoingApprovalCriteria(msg.approvalCriteria) : undefined;
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     toProto() {
-        return new proto.badges.UserOutgoingApproval(this.convert(string_numbers_1.Stringify));
+        return new badges.UserOutgoingApproval(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return UserOutgoingApproval.fromProto(proto.badges.UserOutgoingApproval.fromJson(jsonValue, options), convertFunction);
+        return UserOutgoingApproval.fromProto(badges.UserOutgoingApproval.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return UserOutgoingApproval.fromProto(proto.badges.UserOutgoingApproval.fromJsonString(jsonString, options), convertFunction);
+        return UserOutgoingApproval.fromProto(badges.UserOutgoingApproval.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new UserOutgoingApproval({
             toListId: item.toListId,
             initiatedByListId: item.initiatedByListId,
-            transferTimes: item.transferTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            badgeIds: item.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            ownershipTimes: item.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
+            transferTimes: item.transferTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            badgeIds: item.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            ownershipTimes: item.ownershipTimes.map((x) => UintRange.fromProto(x, convertFunction)),
             approvalId: item.approvalId,
             uri: item.uri,
             customData: item.customData,
@@ -83,8 +57,7 @@ class UserOutgoingApproval extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.UserOutgoingApproval = UserOutgoingApproval;
-class OutgoingApprovalCriteria extends base_1.BaseNumberTypeClass {
+export class OutgoingApprovalCriteria extends BaseNumberTypeClass {
     mustOwnBadges;
     merkleChallenges;
     predeterminedBalances;
@@ -96,18 +69,18 @@ class OutgoingApprovalCriteria extends base_1.BaseNumberTypeClass {
     coinTransfers;
     constructor(msg) {
         super();
-        this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new misc_1.MustOwnBadges(x));
-        this.merkleChallenges = msg.merkleChallenges?.map((x) => new misc_1.MerkleChallenge(x));
+        this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new MustOwnBadges(x));
+        this.merkleChallenges = msg.merkleChallenges?.map((x) => new MerkleChallenge(x));
         this.predeterminedBalances = msg.predeterminedBalances ? new PredeterminedBalances(msg.predeterminedBalances) : undefined;
         this.approvalAmounts = msg.approvalAmounts ? new ApprovalAmounts(msg.approvalAmounts) : undefined;
         this.maxNumTransfers = msg.maxNumTransfers ? new MaxNumTransfers(msg.maxNumTransfers) : undefined;
         this.requireToEqualsInitiatedBy = msg.requireToEqualsInitiatedBy;
         this.requireToDoesNotEqualInitiatedBy = msg.requireToDoesNotEqualInitiatedBy;
-        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new misc_1.CoinTransfer(x)) : undefined;
-        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new misc_1.ZkProof(x)) : undefined;
+        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new CoinTransfer(x)) : undefined;
+        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new ZkProof(x)) : undefined;
     }
     convert(convertFunction) {
-        return new OutgoingApprovalCriteria((0, base_1.deepCopyPrimitives)({
+        return new OutgoingApprovalCriteria(deepCopyPrimitives({
             mustOwnBadges: this.mustOwnBadges?.map((x) => x.convert(convertFunction)),
             merkleChallenges: this.merkleChallenges?.map((x) => x.convert(convertFunction)),
             predeterminedBalances: this.predeterminedBalances?.convert(convertFunction),
@@ -120,25 +93,25 @@ class OutgoingApprovalCriteria extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto.badges.OutgoingApprovalCriteria(this.convert(string_numbers_1.Stringify));
+        return new badges.OutgoingApprovalCriteria(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return OutgoingApprovalCriteria.fromProto(proto.badges.OutgoingApprovalCriteria.fromJson(jsonValue, options), convertFunction);
+        return OutgoingApprovalCriteria.fromProto(badges.OutgoingApprovalCriteria.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return OutgoingApprovalCriteria.fromProto(proto.badges.OutgoingApprovalCriteria.fromJsonString(jsonString, options), convertFunction);
+        return OutgoingApprovalCriteria.fromProto(badges.OutgoingApprovalCriteria.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new OutgoingApprovalCriteria({
-            mustOwnBadges: item.mustOwnBadges.map((x) => misc_1.MustOwnBadges.fromProto(x, convertFunction)),
-            merkleChallenges: item.merkleChallenges.map((x) => misc_1.MerkleChallenge.fromProto(x, convertFunction)),
+            mustOwnBadges: item.mustOwnBadges.map((x) => MustOwnBadges.fromProto(x, convertFunction)),
+            merkleChallenges: item.merkleChallenges.map((x) => MerkleChallenge.fromProto(x, convertFunction)),
             predeterminedBalances: item.predeterminedBalances ? PredeterminedBalances.fromProto(item.predeterminedBalances, convertFunction) : undefined,
             approvalAmounts: item.approvalAmounts ? ApprovalAmounts.fromProto(item.approvalAmounts, convertFunction) : undefined,
             maxNumTransfers: item.maxNumTransfers ? MaxNumTransfers.fromProto(item.maxNumTransfers, convertFunction) : undefined,
             requireToEqualsInitiatedBy: item.requireToEqualsInitiatedBy,
             requireToDoesNotEqualInitiatedBy: item.requireToDoesNotEqualInitiatedBy,
             zkProofs: item.zkProofs,
-            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => misc_1.CoinTransfer.fromProto(x, convertFunction)) : undefined
+            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => CoinTransfer.fromProto(x, convertFunction)) : undefined
         });
     }
     castToCollectionApprovalCriteria() {
@@ -159,8 +132,7 @@ class OutgoingApprovalCriteria extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.OutgoingApprovalCriteria = OutgoingApprovalCriteria;
-class PredeterminedBalances extends base_1.BaseNumberTypeClass {
+export class PredeterminedBalances extends BaseNumberTypeClass {
     manualBalances;
     incrementedBalances;
     orderCalculationMethod;
@@ -171,20 +143,20 @@ class PredeterminedBalances extends base_1.BaseNumberTypeClass {
         this.orderCalculationMethod = new PredeterminedOrderCalculationMethod(msg.orderCalculationMethod);
     }
     convert(convertFunction) {
-        return new PredeterminedBalances((0, base_1.deepCopyPrimitives)({
+        return new PredeterminedBalances(deepCopyPrimitives({
             manualBalances: this.manualBalances.map((x) => x.convert(convertFunction)),
             incrementedBalances: this.incrementedBalances.convert(convertFunction),
             orderCalculationMethod: this.orderCalculationMethod
         }));
     }
     toProto() {
-        return new proto.badges.PredeterminedBalances(this.convert(string_numbers_1.Stringify));
+        return new badges.PredeterminedBalances(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return PredeterminedBalances.fromProto(proto.badges.PredeterminedBalances.fromJson(jsonValue, options), convertFunction);
+        return PredeterminedBalances.fromProto(badges.PredeterminedBalances.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return PredeterminedBalances.fromProto(proto.badges.PredeterminedBalances.fromJsonString(jsonString, options), convertFunction);
+        return PredeterminedBalances.fromProto(badges.PredeterminedBalances.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new PredeterminedBalances({
@@ -209,41 +181,39 @@ class PredeterminedBalances extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.PredeterminedBalances = PredeterminedBalances;
-class ManualBalances extends base_1.BaseNumberTypeClass {
+export class ManualBalances extends BaseNumberTypeClass {
     balances;
     constructor(msg) {
         super();
-        this.balances = balances_1.BalanceArray.From(msg.balances);
+        this.balances = BalanceArray.From(msg.balances);
     }
     convert(convertFunction) {
-        return new ManualBalances((0, base_1.deepCopyPrimitives)({
+        return new ManualBalances(deepCopyPrimitives({
             balances: this.balances.map((x) => x.convert(convertFunction))
         }));
     }
     toProto() {
-        return new proto.badges.ManualBalances(this.convert(string_numbers_1.Stringify));
+        return new badges.ManualBalances(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return ManualBalances.fromProto(proto.badges.ManualBalances.fromJson(jsonValue, options), convertFunction);
+        return ManualBalances.fromProto(badges.ManualBalances.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return ManualBalances.fromProto(proto.badges.ManualBalances.fromJsonString(jsonString, options), convertFunction);
+        return ManualBalances.fromProto(badges.ManualBalances.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new ManualBalances({
-            balances: item.balances.map((x) => balances_1.Balance.fromProto(x, convertFunction))
+            balances: item.balances.map((x) => Balance.fromProto(x, convertFunction))
         });
     }
 }
-exports.ManualBalances = ManualBalances;
-class IncrementedBalances extends base_1.BaseNumberTypeClass {
+export class IncrementedBalances extends BaseNumberTypeClass {
     startBalances;
     incrementBadgeIdsBy;
     incrementOwnershipTimesBy;
     constructor(msg) {
         super();
-        this.startBalances = balances_1.BalanceArray.From(msg.startBalances);
+        this.startBalances = BalanceArray.From(msg.startBalances);
         this.incrementBadgeIdsBy = msg.incrementBadgeIdsBy;
         this.incrementOwnershipTimesBy = msg.incrementOwnershipTimesBy;
     }
@@ -251,31 +221,30 @@ class IncrementedBalances extends base_1.BaseNumberTypeClass {
         return ['incrementBadgeIdsBy', 'incrementOwnershipTimesBy'];
     }
     convert(convertFunction) {
-        return new IncrementedBalances((0, base_1.deepCopyPrimitives)({
+        return new IncrementedBalances(deepCopyPrimitives({
             startBalances: this.startBalances.map((x) => x.convert(convertFunction)),
             incrementBadgeIdsBy: convertFunction(this.incrementBadgeIdsBy),
             incrementOwnershipTimesBy: convertFunction(this.incrementOwnershipTimesBy)
         }));
     }
     toProto() {
-        return new proto.badges.IncrementedBalances(this.convert(string_numbers_1.Stringify));
+        return new badges.IncrementedBalances(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return IncrementedBalances.fromProto(proto.badges.IncrementedBalances.fromJson(jsonValue, options), convertFunction);
+        return IncrementedBalances.fromProto(badges.IncrementedBalances.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return IncrementedBalances.fromProto(proto.badges.IncrementedBalances.fromJsonString(jsonString, options), convertFunction);
+        return IncrementedBalances.fromProto(badges.IncrementedBalances.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new IncrementedBalances({
-            startBalances: item.startBalances.map((x) => balances_1.Balance.fromProto(x, convertFunction)),
+            startBalances: item.startBalances.map((x) => Balance.fromProto(x, convertFunction)),
             incrementBadgeIdsBy: convertFunction(item.incrementBadgeIdsBy),
             incrementOwnershipTimesBy: convertFunction(item.incrementOwnershipTimesBy)
         });
     }
 }
-exports.IncrementedBalances = IncrementedBalances;
-class PredeterminedOrderCalculationMethod extends base_1.CustomTypeClass {
+export class PredeterminedOrderCalculationMethod extends CustomTypeClass {
     useOverallNumTransfers;
     usePerToAddressNumTransfers;
     usePerFromAddressNumTransfers;
@@ -292,7 +261,7 @@ class PredeterminedOrderCalculationMethod extends base_1.CustomTypeClass {
         this.challengeTrackerId = msg.challengeTrackerId;
     }
     toProto() {
-        return new proto.badges.PredeterminedOrderCalculationMethod(this.toJson());
+        return new badges.PredeterminedOrderCalculationMethod(this.toJson());
     }
     static fromJson(jsonValue, options) {
         return PredeterminedOrderCalculationMethod.fromJson(jsonValue, options);
@@ -311,8 +280,7 @@ class PredeterminedOrderCalculationMethod extends base_1.CustomTypeClass {
         });
     }
 }
-exports.PredeterminedOrderCalculationMethod = PredeterminedOrderCalculationMethod;
-class ApprovalAmounts extends base_1.BaseNumberTypeClass {
+export class ApprovalAmounts extends BaseNumberTypeClass {
     overallApprovalAmount;
     perToAddressApprovalAmount;
     perFromAddressApprovalAmount;
@@ -330,7 +298,7 @@ class ApprovalAmounts extends base_1.BaseNumberTypeClass {
         return ['overallApprovalAmount', 'perToAddressApprovalAmount', 'perFromAddressApprovalAmount', 'perInitiatedByAddressApprovalAmount'];
     }
     convert(convertFunction) {
-        return new ApprovalAmounts((0, base_1.deepCopyPrimitives)({
+        return new ApprovalAmounts(deepCopyPrimitives({
             overallApprovalAmount: convertFunction(this.overallApprovalAmount),
             perToAddressApprovalAmount: convertFunction(this.perToAddressApprovalAmount),
             perFromAddressApprovalAmount: convertFunction(this.perFromAddressApprovalAmount),
@@ -339,13 +307,13 @@ class ApprovalAmounts extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto.badges.ApprovalAmounts(this.convert(string_numbers_1.Stringify));
+        return new badges.ApprovalAmounts(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return ApprovalAmounts.fromProto(proto.badges.ApprovalAmounts.fromJson(jsonValue, options), convertFunction);
+        return ApprovalAmounts.fromProto(badges.ApprovalAmounts.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return ApprovalAmounts.fromProto(proto.badges.ApprovalAmounts.fromJsonString(jsonString, options), convertFunction);
+        return ApprovalAmounts.fromProto(badges.ApprovalAmounts.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new ApprovalAmounts({
@@ -357,8 +325,7 @@ class ApprovalAmounts extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.ApprovalAmounts = ApprovalAmounts;
-class MaxNumTransfers extends base_1.BaseNumberTypeClass {
+export class MaxNumTransfers extends BaseNumberTypeClass {
     overallMaxNumTransfers;
     perToAddressMaxNumTransfers;
     perFromAddressMaxNumTransfers;
@@ -376,7 +343,7 @@ class MaxNumTransfers extends base_1.BaseNumberTypeClass {
         return ['overallMaxNumTransfers', 'perToAddressMaxNumTransfers', 'perFromAddressMaxNumTransfers', 'perInitiatedByAddressMaxNumTransfers'];
     }
     convert(convertFunction) {
-        return new MaxNumTransfers((0, base_1.deepCopyPrimitives)({
+        return new MaxNumTransfers(deepCopyPrimitives({
             overallMaxNumTransfers: convertFunction(this.overallMaxNumTransfers),
             perToAddressMaxNumTransfers: convertFunction(this.perToAddressMaxNumTransfers),
             perFromAddressMaxNumTransfers: convertFunction(this.perFromAddressMaxNumTransfers),
@@ -385,13 +352,13 @@ class MaxNumTransfers extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto.badges.MaxNumTransfers(this.convert(string_numbers_1.Stringify));
+        return new badges.MaxNumTransfers(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return MaxNumTransfers.fromProto(proto.badges.MaxNumTransfers.fromJson(jsonValue, options), convertFunction);
+        return MaxNumTransfers.fromProto(badges.MaxNumTransfers.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return MaxNumTransfers.fromProto(proto.badges.MaxNumTransfers.fromJsonString(jsonString, options), convertFunction);
+        return MaxNumTransfers.fromProto(badges.MaxNumTransfers.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new MaxNumTransfers({
@@ -403,8 +370,7 @@ class MaxNumTransfers extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.MaxNumTransfers = MaxNumTransfers;
-class UserIncomingApproval extends base_1.BaseNumberTypeClass {
+export class UserIncomingApproval extends BaseNumberTypeClass {
     fromListId;
     initiatedByListId;
     transferTimes;
@@ -418,33 +384,33 @@ class UserIncomingApproval extends base_1.BaseNumberTypeClass {
         super();
         this.fromListId = msg.fromListId;
         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.uri = msg.uri;
         this.customData = msg.customData;
         this.approvalCriteria = msg.approvalCriteria ? new IncomingApprovalCriteria(msg.approvalCriteria) : undefined;
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     toProto() {
-        return new proto.badges.UserIncomingApproval(this.convert(string_numbers_1.Stringify));
+        return new badges.UserIncomingApproval(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return UserIncomingApproval.fromProto(proto.badges.UserIncomingApproval.fromJson(jsonValue, options), convertFunction);
+        return UserIncomingApproval.fromProto(badges.UserIncomingApproval.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return UserIncomingApproval.fromProto(proto.badges.UserIncomingApproval.fromJsonString(jsonString, options), convertFunction);
+        return UserIncomingApproval.fromProto(badges.UserIncomingApproval.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new UserIncomingApproval({
             fromListId: item.fromListId,
             initiatedByListId: item.initiatedByListId,
-            transferTimes: item.transferTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            badgeIds: item.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            ownershipTimes: item.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
+            transferTimes: item.transferTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            badgeIds: item.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            ownershipTimes: item.ownershipTimes.map((x) => UintRange.fromProto(x, convertFunction)),
             approvalId: item.approvalId,
             uri: item.uri,
             customData: item.customData,
@@ -459,8 +425,7 @@ class UserIncomingApproval extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.UserIncomingApproval = UserIncomingApproval;
-class IncomingApprovalCriteria extends base_1.BaseNumberTypeClass {
+export class IncomingApprovalCriteria extends BaseNumberTypeClass {
     mustOwnBadges;
     merkleChallenges;
     predeterminedBalances;
@@ -472,18 +437,18 @@ class IncomingApprovalCriteria extends base_1.BaseNumberTypeClass {
     coinTransfers;
     constructor(msg) {
         super();
-        this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new misc_1.MustOwnBadges(x));
-        this.merkleChallenges = msg.merkleChallenges?.map((x) => new misc_1.MerkleChallenge(x));
+        this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new MustOwnBadges(x));
+        this.merkleChallenges = msg.merkleChallenges?.map((x) => new MerkleChallenge(x));
         this.predeterminedBalances = msg.predeterminedBalances ? new PredeterminedBalances(msg.predeterminedBalances) : undefined;
         this.approvalAmounts = msg.approvalAmounts ? new ApprovalAmounts(msg.approvalAmounts) : undefined;
         this.maxNumTransfers = msg.maxNumTransfers ? new MaxNumTransfers(msg.maxNumTransfers) : undefined;
         this.requireFromEqualsInitiatedBy = msg.requireFromEqualsInitiatedBy;
         this.requireFromDoesNotEqualInitiatedBy = msg.requireFromDoesNotEqualInitiatedBy;
-        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new misc_1.ZkProof(x)) : undefined;
-        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new misc_1.CoinTransfer(x)) : undefined;
+        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new ZkProof(x)) : undefined;
+        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new CoinTransfer(x)) : undefined;
     }
     convert(convertFunction) {
-        return new IncomingApprovalCriteria((0, base_1.deepCopyPrimitives)({
+        return new IncomingApprovalCriteria(deepCopyPrimitives({
             mustOwnBadges: this.mustOwnBadges?.map((x) => x.convert(convertFunction)),
             merkleChallenge: this.merkleChallenges?.map((x) => x.convert(convertFunction)),
             predeterminedBalances: this.predeterminedBalances ? this.predeterminedBalances.convert(convertFunction) : undefined,
@@ -496,25 +461,25 @@ class IncomingApprovalCriteria extends base_1.BaseNumberTypeClass {
         }));
     }
     toProto() {
-        return new proto.badges.IncomingApprovalCriteria(this.convert(string_numbers_1.Stringify));
+        return new badges.IncomingApprovalCriteria(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return IncomingApprovalCriteria.fromProto(proto.badges.IncomingApprovalCriteria.fromJson(jsonValue, options), convertFunction);
+        return IncomingApprovalCriteria.fromProto(badges.IncomingApprovalCriteria.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return IncomingApprovalCriteria.fromProto(proto.badges.IncomingApprovalCriteria.fromJsonString(jsonString, options), convertFunction);
+        return IncomingApprovalCriteria.fromProto(badges.IncomingApprovalCriteria.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new IncomingApprovalCriteria({
-            mustOwnBadges: item.mustOwnBadges.map((x) => misc_1.MustOwnBadges.fromProto(x, convertFunction)),
-            merkleChallenges: item.merkleChallenges.map((x) => misc_1.MerkleChallenge.fromProto(x, convertFunction)),
+            mustOwnBadges: item.mustOwnBadges.map((x) => MustOwnBadges.fromProto(x, convertFunction)),
+            merkleChallenges: item.merkleChallenges.map((x) => MerkleChallenge.fromProto(x, convertFunction)),
             predeterminedBalances: item.predeterminedBalances ? PredeterminedBalances.fromProto(item.predeterminedBalances, convertFunction) : undefined,
             approvalAmounts: item.approvalAmounts ? ApprovalAmounts.fromProto(item.approvalAmounts, convertFunction) : undefined,
             maxNumTransfers: item.maxNumTransfers ? MaxNumTransfers.fromProto(item.maxNumTransfers, convertFunction) : undefined,
             requireFromEqualsInitiatedBy: item.requireFromEqualsInitiatedBy,
             requireFromDoesNotEqualInitiatedBy: item.requireFromDoesNotEqualInitiatedBy,
-            zkProofs: item.zkProofs?.map((x) => misc_1.ZkProof.fromProto(x)),
-            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => misc_1.CoinTransfer.fromProto(x, convertFunction)) : undefined
+            zkProofs: item.zkProofs?.map((x) => ZkProof.fromProto(x)),
+            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => CoinTransfer.fromProto(x, convertFunction)) : undefined
         });
     }
     castToCollectionApprovalCriteria() {
@@ -535,8 +500,7 @@ class IncomingApprovalCriteria extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.IncomingApprovalCriteria = IncomingApprovalCriteria;
-class CollectionApproval extends base_1.BaseNumberTypeClass {
+export class CollectionApproval extends BaseNumberTypeClass {
     toListId;
     fromListId;
     initiatedByListId;
@@ -552,37 +516,37 @@ class CollectionApproval extends base_1.BaseNumberTypeClass {
         this.toListId = msg.toListId;
         this.fromListId = msg.fromListId;
         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.uri = msg.uri;
         this.customData = msg.customData;
         this.approvalCriteria = msg.approvalCriteria ? new ApprovalCriteria(msg.approvalCriteria) : undefined;
     }
     static validateUpdate(oldApprovals, newApprovals, canUpdateCollectionApprovals) {
-        return validateCollectionApprovalsUpdate(oldApprovals.map((x) => x.convert(string_numbers_1.BigIntify)), newApprovals.map((x) => x.convert(string_numbers_1.BigIntify)), canUpdateCollectionApprovals.map((x) => x.convert(string_numbers_1.BigIntify)));
+        return validateCollectionApprovalsUpdate(oldApprovals.map((x) => x.convert(BigIntify)), newApprovals.map((x) => x.convert(BigIntify)), canUpdateCollectionApprovals.map((x) => x.convert(BigIntify)));
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     toProto() {
-        return new proto.badges.CollectionApproval(this.convert(string_numbers_1.Stringify));
+        return new badges.CollectionApproval(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return CollectionApproval.fromProto(proto.badges.CollectionApproval.fromJson(jsonValue, options), convertFunction);
+        return CollectionApproval.fromProto(badges.CollectionApproval.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return CollectionApproval.fromProto(proto.badges.CollectionApproval.fromJsonString(jsonString, options), convertFunction);
+        return CollectionApproval.fromProto(badges.CollectionApproval.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new CollectionApproval({
             toListId: item.toListId,
             fromListId: item.fromListId,
             initiatedByListId: item.initiatedByListId,
-            transferTimes: item.transferTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            badgeIds: item.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
-            ownershipTimes: item.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
+            transferTimes: item.transferTimes.map((x) => UintRange.fromProto(x, convertFunction)),
+            badgeIds: item.badgeIds.map((x) => UintRange.fromProto(x, convertFunction)),
+            ownershipTimes: item.ownershipTimes.map((x) => UintRange.fromProto(x, convertFunction)),
             approvalId: item.approvalId,
             uri: item.uri,
             customData: item.customData,
@@ -612,8 +576,7 @@ class CollectionApproval extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.CollectionApproval = CollectionApproval;
-class ApprovalCriteria extends base_1.BaseNumberTypeClass {
+export class ApprovalCriteria extends BaseNumberTypeClass {
     mustOwnBadges;
     merkleChallenges;
     predeterminedBalances;
@@ -629,8 +592,8 @@ class ApprovalCriteria extends base_1.BaseNumberTypeClass {
     coinTransfers;
     constructor(msg) {
         super();
-        this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new misc_1.MustOwnBadges(x));
-        this.merkleChallenges = msg.merkleChallenges?.map((x) => new misc_1.MerkleChallenge(x));
+        this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new MustOwnBadges(x));
+        this.merkleChallenges = msg.merkleChallenges?.map((x) => new MerkleChallenge(x));
         this.predeterminedBalances = msg.predeterminedBalances ? new PredeterminedBalances(msg.predeterminedBalances) : undefined;
         this.approvalAmounts = msg.approvalAmounts ? new ApprovalAmounts(msg.approvalAmounts) : undefined;
         this.maxNumTransfers = msg.maxNumTransfers ? new MaxNumTransfers(msg.maxNumTransfers) : undefined;
@@ -640,30 +603,30 @@ class ApprovalCriteria extends base_1.BaseNumberTypeClass {
         this.requireFromDoesNotEqualInitiatedBy = msg.requireFromDoesNotEqualInitiatedBy;
         this.overridesFromOutgoingApprovals = msg.overridesFromOutgoingApprovals;
         this.overridesToIncomingApprovals = msg.overridesToIncomingApprovals;
-        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new misc_1.ZkProof(x)) : undefined;
-        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new misc_1.CoinTransfer(x)) : undefined;
+        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new ZkProof(x)) : undefined;
+        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new CoinTransfer(x)) : undefined;
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     toProto() {
-        return new proto.badges.ApprovalCriteria(this.convert(string_numbers_1.Stringify));
+        return new badges.ApprovalCriteria(this.convert(Stringify));
     }
     static fromJson(jsonValue, convertFunction, options) {
-        return ApprovalCriteria.fromProto(proto.badges.ApprovalCriteria.fromJson(jsonValue, options), convertFunction);
+        return ApprovalCriteria.fromProto(badges.ApprovalCriteria.fromJson(jsonValue, options), convertFunction);
     }
     static fromJsonString(jsonString, convertFunction, options) {
-        return ApprovalCriteria.fromProto(proto.badges.ApprovalCriteria.fromJsonString(jsonString, options), convertFunction);
+        return ApprovalCriteria.fromProto(badges.ApprovalCriteria.fromJsonString(jsonString, options), convertFunction);
     }
     static fromProto(item, convertFunction) {
         return new ApprovalCriteria({
-            mustOwnBadges: item.mustOwnBadges.map((x) => misc_1.MustOwnBadges.fromProto(x, convertFunction)),
-            merkleChallenges: item.merkleChallenges.map((x) => misc_1.MerkleChallenge.fromProto(x, convertFunction)),
+            mustOwnBadges: item.mustOwnBadges.map((x) => MustOwnBadges.fromProto(x, convertFunction)),
+            merkleChallenges: item.merkleChallenges.map((x) => MerkleChallenge.fromProto(x, convertFunction)),
             predeterminedBalances: item.predeterminedBalances ? PredeterminedBalances.fromProto(item.predeterminedBalances, convertFunction) : undefined,
             approvalAmounts: item.approvalAmounts ? ApprovalAmounts.fromProto(item.approvalAmounts, convertFunction) : undefined,
             maxNumTransfers: item.maxNumTransfers ? MaxNumTransfers.fromProto(item.maxNumTransfers, convertFunction) : undefined,
-            zkProofs: item.zkProofs.map((x) => misc_1.ZkProof.fromProto(x)),
-            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => misc_1.CoinTransfer.fromProto(x, convertFunction)) : undefined,
+            zkProofs: item.zkProofs.map((x) => ZkProof.fromProto(x)),
+            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => CoinTransfer.fromProto(x, convertFunction)) : undefined,
             requireToEqualsInitiatedBy: item.requireToEqualsInitiatedBy,
             requireFromEqualsInitiatedBy: item.requireFromEqualsInitiatedBy,
             requireToDoesNotEqualInitiatedBy: item.requireToDoesNotEqualInitiatedBy,
@@ -673,21 +636,20 @@ class ApprovalCriteria extends base_1.BaseNumberTypeClass {
         });
     }
 }
-exports.ApprovalCriteria = ApprovalCriteria;
-class UserOutgoingApprovalWithDetails extends UserOutgoingApproval {
+export class UserOutgoingApprovalWithDetails extends UserOutgoingApproval {
     toList;
     initiatedByList;
     approvalCriteria;
     details;
     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);
         this.approvalCriteria = data.approvalCriteria ? new OutgoingApprovalCriteriaWithDetails(data.approvalCriteria) : undefined;
         this.details = data.details ? new ApprovalInfoDetails(data.details) : undefined;
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     clone() {
         return super.clone();
@@ -704,8 +666,7 @@ class UserOutgoingApprovalWithDetails extends UserOutgoingApproval {
         return this.castToCollectionTransfer(fromAddress).castToUniversalPermission();
     }
 }
-exports.UserOutgoingApprovalWithDetails = UserOutgoingApprovalWithDetails;
-class UserIncomingApprovalWithDetails extends UserIncomingApproval {
+export class UserIncomingApprovalWithDetails extends UserIncomingApproval {
     details;
     fromList;
     initiatedByList;
@@ -713,15 +674,15 @@ class UserIncomingApprovalWithDetails extends UserIncomingApproval {
     constructor(data) {
         super(data);
         this.details = data.details ? new ApprovalInfoDetails(data.details) : undefined;
-        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);
         this.approvalCriteria = data.approvalCriteria ? new IncomingApprovalCriteriaWithDetails(data.approvalCriteria) : undefined;
     }
     clone() {
         return super.clone();
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     castToCollectionTransfer(toAddress) {
         return new CollectionApprovalWithDetails({
@@ -735,8 +696,7 @@ class UserIncomingApprovalWithDetails extends UserIncomingApproval {
         return this.castToCollectionTransfer(toAddress).castToUniversalPermission();
     }
 }
-exports.UserIncomingApprovalWithDetails = UserIncomingApprovalWithDetails;
-class ChallengeDetails extends base_1.BaseNumberTypeClass {
+export class ChallengeDetails extends BaseNumberTypeClass {
     treeOptions;
     numLeaves;
     leaves;
@@ -757,11 +717,10 @@ class ChallengeDetails extends base_1.BaseNumberTypeClass {
         return ['numLeaves'];
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
 }
-exports.ChallengeDetails = ChallengeDetails;
-class ChallengeInfoDetails extends base_1.BaseNumberTypeClass {
+export class ChallengeInfoDetails extends BaseNumberTypeClass {
     challengeDetails;
     claim;
     constructor(data) {
@@ -770,14 +729,13 @@ class ChallengeInfoDetails extends base_1.BaseNumberTypeClass {
         this.claim = data.claim;
     }
     convert(convertFunction) {
-        return new ChallengeInfoDetails((0, base_1.deepCopyPrimitives)({
+        return new ChallengeInfoDetails(deepCopyPrimitives({
             ...this,
             challengeDetails: this.challengeDetails.convert(convertFunction)
         }));
     }
 }
-exports.ChallengeInfoDetails = ChallengeInfoDetails;
-class ApprovalInfoDetails extends base_1.BaseNumberTypeClass {
+export class ApprovalInfoDetails extends BaseNumberTypeClass {
     name;
     description;
     constructor(data) {
@@ -786,11 +744,10 @@ class ApprovalInfoDetails extends base_1.BaseNumberTypeClass {
         this.description = data.description;
     }
     convert(convertFunction) {
-        return new ApprovalInfoDetails((0, base_1.deepCopyPrimitives)({ ...this }));
+        return new ApprovalInfoDetails(deepCopyPrimitives({ ...this }));
     }
 }
-exports.ApprovalInfoDetails = ApprovalInfoDetails;
-class MerkleChallengeWithDetails extends misc_1.MerkleChallenge {
+export class MerkleChallengeWithDetails extends MerkleChallenge {
     challengeInfoDetails;
     constructor(data) {
         super(data);
@@ -800,35 +757,33 @@ class MerkleChallengeWithDetails extends misc_1.MerkleChallenge {
         return super.getNumberFieldNames().concat(this.challengeInfoDetails.challengeDetails.getNumberFieldNames());
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     clone() {
         return super.clone();
     }
 }
-exports.MerkleChallengeWithDetails = MerkleChallengeWithDetails;
-class ApprovalCriteriaWithDetails extends ApprovalCriteria {
+export class ApprovalCriteriaWithDetails extends ApprovalCriteria {
     merkleChallenges;
     constructor(data) {
         super(data);
         this.merkleChallenges = data.merkleChallenges?.map((x) => new MerkleChallengeWithDetails(x));
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     clone() {
         return super.clone();
     }
 }
-exports.ApprovalCriteriaWithDetails = ApprovalCriteriaWithDetails;
-class IncomingApprovalCriteriaWithDetails extends IncomingApprovalCriteria {
+export class IncomingApprovalCriteriaWithDetails extends IncomingApprovalCriteria {
     merkleChallenges;
     constructor(data) {
         super(data);
         this.merkleChallenges = data.merkleChallenges?.map((x) => new MerkleChallengeWithDetails(x));
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     clone() {
         return super.clone();
@@ -849,15 +804,14 @@ class IncomingApprovalCriteriaWithDetails extends IncomingApprovalCriteria {
         });
     }
 }
-exports.IncomingApprovalCriteriaWithDetails = IncomingApprovalCriteriaWithDetails;
-class OutgoingApprovalCriteriaWithDetails extends OutgoingApprovalCriteria {
+export class OutgoingApprovalCriteriaWithDetails extends OutgoingApprovalCriteria {
     merkleChallenges;
     constructor(data) {
         super(data);
         this.merkleChallenges = data.merkleChallenges?.map((x) => new MerkleChallengeWithDetails(x));
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     clone() {
         return super.clone();
@@ -878,8 +832,7 @@ class OutgoingApprovalCriteriaWithDetails extends OutgoingApprovalCriteria {
         });
     }
 }
-exports.OutgoingApprovalCriteriaWithDetails = OutgoingApprovalCriteriaWithDetails;
-class CollectionApprovalWithDetails extends CollectionApproval {
+export class CollectionApprovalWithDetails extends CollectionApproval {
     details;
     toList;
     fromList;
@@ -888,23 +841,23 @@ class CollectionApprovalWithDetails extends CollectionApproval {
     constructor(data) {
         super(data);
         this.details = data.details ? new ApprovalInfoDetails(data.details) : undefined;
-        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);
         this.approvalCriteria = data.approvalCriteria ? new ApprovalCriteriaWithDetails(data.approvalCriteria) : undefined;
     }
     convert(convertFunction) {
-        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+        return convertClassPropertiesAndMaintainNumberTypes(this, convertFunction);
     }
     clone() {
         return super.clone();
     }
     castToUniversalPermission() {
         return {
-            ...validate_utils_1.AllDefaultValues,
-            badgeIds: this.badgeIds.convert(string_numbers_1.BigIntify),
-            transferTimes: this.transferTimes.convert(string_numbers_1.BigIntify),
-            ownershipTimes: this.ownershipTimes.convert(string_numbers_1.BigIntify),
+            ...AllDefaultValues,
+            badgeIds: this.badgeIds.convert(BigIntify),
+            transferTimes: this.transferTimes.convert(BigIntify),
+            ownershipTimes: this.ownershipTimes.convert(BigIntify),
             fromList: this.fromList,
             toList: this.toList,
             initiatedByList: this.initiatedByList,
@@ -921,7 +874,7 @@ class CollectionApprovalWithDetails extends CollectionApproval {
                 approvalCriteria: {
                     ...this.approvalCriteria,
                     merkleChallenges: this.approvalCriteria?.merkleChallenges
-                        ?.map((x) => x.convert(string_numbers_1.BigIntify))
+                        ?.map((x) => x.convert(BigIntify))
                         .map((x) => {
                         return {
                             ...x,
@@ -929,7 +882,7 @@ class CollectionApprovalWithDetails extends CollectionApproval {
                         };
                     })
                 },
-                approvalCriteriaWithDetails: this.approvalCriteria?.convert(string_numbers_1.BigIntify)
+                approvalCriteriaWithDetails: this.approvalCriteria?.convert(BigIntify)
             }
         };
     }
@@ -959,19 +912,18 @@ class CollectionApprovalWithDetails extends CollectionApproval {
         });
     }
     static validateUpdate(oldApprovals, newApprovals, canUpdateCollectionApprovals) {
-        return validateCollectionApprovalsUpdate(oldApprovals.map((x) => x.convert(string_numbers_1.BigIntify)), newApprovals.map((x) => x.convert(string_numbers_1.BigIntify)), canUpdateCollectionApprovals.map((x) => x.convert(string_numbers_1.BigIntify)));
+        return validateCollectionApprovalsUpdate(oldApprovals.map((x) => x.convert(BigIntify)), newApprovals.map((x) => x.convert(BigIntify)), canUpdateCollectionApprovals.map((x) => x.convert(BigIntify)));
     }
 }
-exports.CollectionApprovalWithDetails = CollectionApprovalWithDetails;
-function getFirstMatchOnlyWithApprovalCriteria(permissions) {
+export function getFirstMatchOnlyWithApprovalCriteria(permissions) {
     let handled = [];
     for (const permission of permissions) {
-        const badgeIds = (0, overlaps_1.GetUintRangesWithOptions)(permission.badgeIds, permission.usesBadgeIds);
-        const timelineTimes = (0, overlaps_1.GetUintRangesWithOptions)(permission.timelineTimes, permission.usesTimelineTimes);
-        const transferTimes = (0, overlaps_1.GetUintRangesWithOptions)(permission.transferTimes, permission.usesTransferTimes);
-        const ownershipTimes = (0, overlaps_1.GetUintRangesWithOptions)(permission.ownershipTimes, permission.usesOwnershipTimes);
-        const permanentlyPermittedTimes = (0, overlaps_1.GetUintRangesWithOptions)(permission.permanentlyPermittedTimes, true);
-        const permanentlyForbiddenTimes = (0, overlaps_1.GetUintRangesWithOptions)(permission.permanentlyForbiddenTimes, true);
+        const badgeIds = GetUintRangesWithOptions(permission.badgeIds, permission.usesBadgeIds);
+        const timelineTimes = GetUintRangesWithOptions(permission.timelineTimes, permission.usesTimelineTimes);
+        const transferTimes = GetUintRangesWithOptions(permission.transferTimes, permission.usesTransferTimes);
+        const ownershipTimes = GetUintRangesWithOptions(permission.ownershipTimes, permission.usesOwnershipTimes);
+        const permanentlyPermittedTimes = GetUintRangesWithOptions(permission.permanentlyPermittedTimes, true);
+        const permanentlyForbiddenTimes = GetUintRangesWithOptions(permission.permanentlyForbiddenTimes, true);
         for (const badgeId of badgeIds) {
             for (const timelineTime of timelineTimes) {
                 for (const transferTime of transferTimes) {
@@ -997,7 +949,7 @@ function getFirstMatchOnlyWithApprovalCriteria(permissions) {
                                 arbitraryValue: arbValue
                             }
                         ];
-                        const [overlaps, inBrokenDownButNotHandled, inHandledButNotBrokenDown] = (0, overlaps_1.getOverlapsAndNonOverlaps)(brokenDown, handled);
+                        const [overlaps, inBrokenDownButNotHandled, inHandledButNotBrokenDown] = getOverlapsAndNonOverlaps(brokenDown, handled);
                         handled = [];
                         handled.push(...inHandledButNotBrokenDown);
                         handled.push(...inBrokenDownButNotHandled);
@@ -1041,12 +993,11 @@ function getFirstMatchOnlyWithApprovalCriteria(permissions) {
     }
     return returnArr;
 }
-exports.getFirstMatchOnlyWithApprovalCriteria = getFirstMatchOnlyWithApprovalCriteria;
-function validateCollectionApprovalsUpdate(oldApprovals, newApprovals, canUpdateCollectionApprovals) {
-    const dummyRanges = [uintRanges_1.UintRangeArray.From([{ start: 1n, end: 1n }])];
-    const oldTimelineFirstMatches = (0, validate_utils_1.getPotentialUpdatesForTimelineValues)(dummyRanges.map((x) => x.clone()), [oldApprovals.map((x) => x.convert(string_numbers_1.BigIntify))]);
-    const newTimelineFirstMatches = (0, validate_utils_1.getPotentialUpdatesForTimelineValues)(dummyRanges.map((x) => x.clone()), [newApprovals.map((x) => x.convert(string_numbers_1.BigIntify))]);
-    const detailsToCheck = (0, validate_utils_1.getUpdateCombinationsToCheck)(oldTimelineFirstMatches, newTimelineFirstMatches, [], function (oldValue, newValue) {
+export function validateCollectionApprovalsUpdate(oldApprovals, newApprovals, canUpdateCollectionApprovals) {
+    const dummyRanges = [UintRangeArray.From([{ start: 1n, end: 1n }])];
+    const oldTimelineFirstMatches = getPotentialUpdatesForTimelineValues(dummyRanges.map((x) => x.clone()), [oldApprovals.map((x) => x.convert(BigIntify))]);
+    const newTimelineFirstMatches = getPotentialUpdatesForTimelineValues(dummyRanges.map((x) => x.clone()), [newApprovals.map((x) => x.convert(BigIntify))]);
+    const detailsToCheck = getUpdateCombinationsToCheck(oldTimelineFirstMatches, newTimelineFirstMatches, [], function (oldValue, newValue) {
         const expandedOldApprovals = expandCollectionApprovals(oldValue);
         const expandedNewApprovals = expandCollectionApprovals(newValue);
         const oldApprovals = expandedOldApprovals.map((x) => x.castToUniversalPermission());
@@ -1060,7 +1011,7 @@ function validateCollectionApprovalsUpdate(oldApprovals, newApprovals, canUpdate
         const firstMatchesForOld = getFirstMatchOnlyWithApprovalCriteria(oldApprovals);
         const firstMatchesForNew = getFirstMatchOnlyWithApprovalCriteria(newApprovals);
         const detailsToReturn = [];
-        const [overlapObjects, inOldButNotNew, inNewButNotOld] = (0, overlaps_1.getOverlapsAndNonOverlaps)(firstMatchesForOld, firstMatchesForNew);
+        const [overlapObjects, inOldButNotNew, inNewButNotOld] = getOverlapsAndNonOverlaps(firstMatchesForOld, firstMatchesForNew);
         for (const overlapObject of overlapObjects) {
             const overlap = overlapObject.overlap;
             const oldDetails = overlapObject.firstDetails;
@@ -1099,9 +1050,9 @@ function validateCollectionApprovalsUpdate(oldApprovals, newApprovals, canUpdate
     });
     const details = detailsToCheck.map((x) => {
         const result = {
-            badgeIds: uintRanges_1.UintRangeArray.From([x.badgeId]),
-            ownershipTimes: uintRanges_1.UintRangeArray.From([x.ownershipTime]),
-            transferTimes: uintRanges_1.UintRangeArray.From([x.transferTime]),
+            badgeIds: UintRangeArray.From([x.badgeId]),
+            ownershipTimes: UintRangeArray.From([x.ownershipTime]),
+            transferTimes: UintRangeArray.From([x.transferTime]),
             toList: x.toList,
             fromList: x.fromList,
             initiatedByList: x.initiatedByList,
@@ -1109,25 +1060,24 @@ function validateCollectionApprovalsUpdate(oldApprovals, newApprovals, canUpdate
         };
         return result;
     });
-    const err = permissions_1.CollectionApprovalPermission.check(details, canUpdateCollectionApprovals.map((x) => x.convert(string_numbers_1.BigIntify)));
+    const err = CollectionApprovalPermission.check(details, canUpdateCollectionApprovals.map((x) => x.convert(BigIntify)));
     if (err) {
         return err;
     }
     return null;
 }
-exports.validateCollectionApprovalsUpdate = validateCollectionApprovalsUpdate;
-function expandCollectionApprovals(approvals) {
+export function expandCollectionApprovals(approvals) {
     const newCurrApprovals = [];
     for (const approval of approvals) {
-        const badgeIds = (0, overlaps_1.GetUintRangesWithOptions)(approval.badgeIds, true);
-        const ownershipTimes = (0, overlaps_1.GetUintRangesWithOptions)(approval.ownershipTimes, true);
-        const times = (0, overlaps_1.GetUintRangesWithOptions)(approval.transferTimes, true);
-        const toListId = (0, overlaps_1.GetListIdWithOptions)(approval.toListId, true);
-        const fromListId = (0, overlaps_1.GetListIdWithOptions)(approval.fromListId, true);
-        const initiatedByListId = (0, overlaps_1.GetListIdWithOptions)(approval.initiatedByListId, true);
-        const toList = (0, overlaps_1.GetListWithOptions)(approval.toList, true);
-        const fromList = (0, overlaps_1.GetListWithOptions)(approval.fromList, true);
-        const initiatedByList = (0, overlaps_1.GetListWithOptions)(approval.initiatedByList, true);
+        const badgeIds = GetUintRangesWithOptions(approval.badgeIds, true);
+        const ownershipTimes = GetUintRangesWithOptions(approval.ownershipTimes, true);
+        const times = GetUintRangesWithOptions(approval.transferTimes, true);
+        const toListId = GetListIdWithOptions(approval.toListId, true);
+        const fromListId = GetListIdWithOptions(approval.fromListId, true);
+        const initiatedByListId = GetListIdWithOptions(approval.initiatedByListId, true);
+        const toList = GetListWithOptions(approval.toList, true);
+        const fromList = GetListWithOptions(approval.fromList, true);
+        const initiatedByList = GetListWithOptions(approval.initiatedByList, true);
         newCurrApprovals.push(new CollectionApprovalWithDetails({
             ...approval,
             toListId: toListId,
@@ -1145,5 +1095,4 @@ function expandCollectionApprovals(approvals) {
     }
     return newCurrApprovals;
 }
-exports.expandCollectionApprovals = expandCollectionApprovals;
 //# sourceMappingURL=approvals.js.map