@polymeshassociation/polymesh-sdk 22.0.0-alpha.2 → 22.0.0-alpha.4

package/utils/conversion.js

@@ -18,9 +18,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.u32ToBigNumber = exports.bigNumberToU32 = exports.meshPermissionsToPermissions = exports.extrinsicPermissionsToTransactionPermissions = exports.permissionsToMeshPermissions = exports.transactionPermissionsToExtrinsicPermissions = exports.transactionPermissionsToTxGroups = exports.txGroupToTxTags = exports.textToString = exports.stringToText = exports.portfolioToPortfolioKind = exports.portfolioIdToMeshPortfolioId = exports.portfolioLikeToPortfolio = exports.portfolioIdToPortfolio = exports.portfolioLikeToPortfolioId = exports.portfolioToPortfolioId = exports.meshPortfolioIdToPortfolio = exports.claimPercentageToClaimPercentageRestrictionValue = exports.claimCountToClaimCountRestrictionValue = exports.meshClaimToInputStatClaim = exports.permillToBigNumber = exports.percentageToPermill = exports.bigNumberToU128 = exports.bigNumberToU64 = exports.u128ToBigNumber = exports.u64ToBigNumber = exports.signerToString = exports.signerToSignatory = exports.signerValueToSigner = exports.signerToSignerValue = exports.signatoryToSignerValue = exports.signerValueToSignatory = exports.identityIdToString = exports.stringToIdentityId = exports.stringToBlockHash = exports.stringToHash = exports.hashToString = exports.accountIdToString = exports.stringToAccountId = exports.momentToDate = exports.dateToMoment = exports.stringToU8aFixed = exports.tickerToString = exports.stringToTickerKey = exports.stringToTicker = exports.bytesToString = exports.stringToBytes = exports.boolToBoolean = exports.booleanToBool = exports.tickerToDid = void 0;
-exports.extrinsicIdentifierToTxTag = exports.txTagToExtrinsicIdentifier = exports.txTagToProtocolOp = exports.complianceRequirementToRequirement = exports.complianceRequirementResultToRequirementCompliance = exports.requirementToComplianceRequirement = exports.trustedClaimIssuerToTrustedIssuer = exports.trustedIssuerToTrustedClaimIssuer = exports.meshClaimTypeToClaimType = exports.stringToTargetIdentity = exports.statsClaimToStatClaimInputType = exports.meshClaimToClaim = exports.middlewareV2EventDetailsToEventIdentifier = exports.middlewareEventToEventIdentifier = exports.scopeToMiddlewareScope = exports.middlewareScopeToScope = exports.claimToMeshClaim = exports.cddIdToString = exports.stringToCddId = exports.meshScopeToScope = exports.scopeToMeshScope = exports.canTransferResultToTransferStatus = exports.cddStatusToBoolean = exports.documentToAssetDocument = exports.assetDocumentToDocument = exports.documentHashToString = exports.stringToDocumentHash = exports.assetIdentifierToSecurityIdentifier = exports.securityIdentifierToAssetIdentifier = exports.isFigiValid = exports.isLeiValid = exports.isCusipValid = exports.isIsinValid = exports.fundingRoundToAssetFundingRound = exports.nameToAssetName = exports.posRatioToBigNumber = exports.assetTypeToKnownOrId = exports.internalAssetTypeToAssetType = exports.u8ToTransferStatus = exports.stringToMemo = exports.authorizationDataToAuthorization = exports.agentGroupToPermissionGroup = exports.balanceToBigNumber = exports.bigNumberToBalance = exports.authorizationTypeToMeshAuthorizationType = exports.authorizationToAuthorizationData = exports.agentGroupToPermissionGroupIdentifier = exports.permissionGroupIdentifierToAgentGroup = exports.u8ToBigNumber = exports.u16ToBigNumber = void 0;
-exports.createStat2ndKey = exports.transferRestrictionTypeToStatOpType = exports.statTypeToStatOpType = exports.meshStatToStatType = exports.statUpdatesToBtreeStatUpdate = exports.keyAndValueToStatUpdate = exports.transferConditionsToBtreeTransferConditions = exports.statisticStatTypesToBtreeStatType = exports.sortStatsByClaimType = exports.statisticsOpTypeToStatType = exports.corporateActionParamsToMeshCorporateActionArgs = exports.corporateActionIdentifierToCaId = exports.distributionToDividendDistributionParams = exports.caTaxWithholdingsToMeshTaxWithholdings = exports.targetsToTargetIdentities = exports.targetIdentitiesToCorporateActionTargets = exports.checkpointToRecordDateSpec = exports.corporateActionKindToCaKind = exports.meshCorporateActionToCorporateActionParams = exports.fundraiserToOfferingDetails = exports.fundraiserTierToTier = exports.middlewareV2PortfolioToPortfolio = exports.middlewarePortfolioToPortfolio = exports.permissionsLikeToPermissions = exports.offeringTierToPriceTier = exports.granularCanTransferResultToTransferBreakdown = exports.transferConditionToTransferRestriction = exports.identitiesToBtreeSet = exports.transferRestrictionToPolymeshTransferCondition = exports.claimIssuerToMeshClaimIssuer = exports.claimTypeToMeshClaimType = exports.portfolioMovementToPortfolioFund = exports.toIdentityWithClaimsArrayV2 = exports.middlewareV2ClaimToClaimData = exports.toIdentityWithClaimsArray = exports.endConditionToSettlementType = exports.meshSettlementTypeToEndCondition = exports.meshAffirmationStatusToAffirmationStatus = exports.meshInstructionStatusToInstructionStatus = exports.venueTypeToMeshVenueType = exports.meshVenueTypeToVenueType = exports.secondaryAccountToMeshSecondaryKey = exports.transactionToTxTag = exports.transactionHexToTxTag = exports.coerceHexToString = exports.addressToKey = exports.keyToAddress = exports.moduleAddressToString = exports.assetComplianceResultToCompliance = exports.txTagToExtrinsicIdentifierV2 = void 0;
-exports.stringToInstructionMemo = exports.scheduleSpecToMeshScheduleSpec = exports.storedScheduleToCheckpointScheduleParams = exports.meshCalendarPeriodToCalendarPeriod = exports.calendarPeriodToMeshCalendarPeriod = exports.middlewareAuthorizationDataToAuthorization = exports.middlewarePermissionsDataToPermissions = exports.datesToScheduleCheckpoints = exports.middlewareAgentGroupDataToPermissionGroup = exports.legToSettlementLeg = exports.middlewarePortfolioDataToPortfolio = exports.expiryToMoment = exports.middlewareInstructionToHistoricInstruction = exports.instructionMemoToString = exports.metadataValueDetailToMeshMetadataValueDetail = exports.metadataValueToMeshMetadataValue = exports.meshMetadataValueToMetadataValue = exports.metadataToMeshMetadataKey = exports.meshMetadataSpecToMetadataSpec = exports.metadataSpecToMeshMetadataSpec = exports.meshProposalStatusToProposalStatus = exports.inputStatTypeToMeshStatType = exports.countStatInputToStatUpdates = exports.claimCountStatInputToStatUpdates = exports.toExemptKey = exports.complianceConditionsToBtreeSet = exports.sortTransferRestrictionByClaimValue = void 0;
+exports.assetComplianceResultToCompliance = exports.txTagToExtrinsicIdentifier = exports.extrinsicIdentifierToTxTag = exports.txTagToProtocolOp = exports.complianceRequirementToRequirement = exports.complianceRequirementResultToRequirementCompliance = exports.requirementToComplianceRequirement = exports.trustedClaimIssuerToTrustedIssuer = exports.trustedIssuerToTrustedClaimIssuer = exports.meshClaimTypeToClaimType = exports.stringToTargetIdentity = exports.statsClaimToStatClaimInputType = exports.meshClaimToClaim = exports.middlewareEventDetailsToEventIdentifier = exports.scopeToMiddlewareScope = exports.middlewareScopeToScope = exports.claimToMeshClaim = exports.cddIdToString = exports.stringToCddId = exports.meshScopeToScope = exports.scopeToMeshScope = exports.canTransferResultToTransferStatus = exports.cddStatusToBoolean = exports.documentToAssetDocument = exports.assetDocumentToDocument = exports.documentHashToString = exports.stringToDocumentHash = exports.assetIdentifierToSecurityIdentifier = exports.securityIdentifierToAssetIdentifier = exports.isFigiValid = exports.isLeiValid = exports.isCusipValid = exports.isIsinValid = exports.fundingRoundToAssetFundingRound = exports.nameToAssetName = exports.posRatioToBigNumber = exports.assetTypeToKnownOrId = exports.internalAssetTypeToAssetType = exports.u8ToTransferStatus = exports.stringToMemo = exports.authorizationDataToAuthorization = exports.agentGroupToPermissionGroup = exports.balanceToBigNumber = exports.bigNumberToBalance = exports.authorizationTypeToMeshAuthorizationType = exports.authorizationToAuthorizationData = exports.agentGroupToPermissionGroupIdentifier = exports.permissionGroupIdentifierToAgentGroup = exports.u8ToBigNumber = exports.u16ToBigNumber = void 0;
+exports.claimCountStatInputToStatUpdates = exports.toExemptKey = exports.complianceConditionsToBtreeSet = exports.sortTransferRestrictionByClaimValue = exports.createStat2ndKey = exports.transferRestrictionTypeToStatOpType = exports.statTypeToStatOpType = exports.meshStatToStatType = exports.statUpdatesToBtreeStatUpdate = exports.keyAndValueToStatUpdate = exports.transferConditionsToBtreeTransferConditions = exports.statisticStatTypesToBtreeStatType = exports.sortStatsByClaimType = exports.statisticsOpTypeToStatType = exports.corporateActionParamsToMeshCorporateActionArgs = exports.corporateActionIdentifierToCaId = exports.distributionToDividendDistributionParams = exports.caTaxWithholdingsToMeshTaxWithholdings = exports.targetsToTargetIdentities = exports.targetIdentitiesToCorporateActionTargets = exports.checkpointToRecordDateSpec = exports.corporateActionKindToCaKind = exports.meshCorporateActionToCorporateActionParams = exports.fundraiserToOfferingDetails = exports.fundraiserTierToTier = exports.middlewarePortfolioToPortfolio = exports.permissionsLikeToPermissions = exports.offeringTierToPriceTier = exports.granularCanTransferResultToTransferBreakdown = exports.transferConditionToTransferRestriction = exports.identitiesToBtreeSet = exports.transferRestrictionToPolymeshTransferCondition = exports.claimIssuerToMeshClaimIssuer = exports.claimTypeToMeshClaimType = exports.portfolioMovementToPortfolioFund = exports.toIdentityWithClaimsArray = exports.middlewareClaimToClaimData = exports.endConditionToSettlementType = exports.meshSettlementTypeToEndCondition = exports.meshAffirmationStatusToAffirmationStatus = exports.meshInstructionStatusToInstructionStatus = exports.venueTypeToMeshVenueType = exports.meshVenueTypeToVenueType = exports.secondaryAccountToMeshSecondaryKey = exports.transactionToTxTag = exports.transactionHexToTxTag = exports.coerceHexToString = exports.addressToKey = exports.keyToAddress = exports.moduleAddressToString = void 0;
+exports.stringToInstructionMemo = exports.scheduleSpecToMeshScheduleSpec = exports.storedScheduleToCheckpointScheduleParams = exports.meshCalendarPeriodToCalendarPeriod = exports.calendarPeriodToMeshCalendarPeriod = exports.middlewareAuthorizationDataToAuthorization = exports.middlewarePermissionsDataToPermissions = exports.datesToScheduleCheckpoints = exports.middlewareAgentGroupDataToPermissionGroup = exports.legToSettlementLeg = exports.middlewarePortfolioDataToPortfolio = exports.expiryToMoment = exports.middlewareInstructionToHistoricInstruction = exports.instructionMemoToString = exports.metadataValueDetailToMeshMetadataValueDetail = exports.metadataValueToMeshMetadataValue = exports.meshMetadataValueToMetadataValue = exports.metadataToMeshMetadataKey = exports.meshMetadataSpecToMetadataSpec = exports.metadataSpecToMeshMetadataSpec = exports.meshProposalStatusToProposalStatus = exports.inputStatTypeToMeshStatType = exports.countStatInputToStatUpdates = void 0;
 const util_1 = require("@polkadot/util");
 const util_crypto_1 = require("@polkadot/util-crypto");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -29,9 +29,9 @@ const lodash_1 = require("lodash");
 const utils_1 = require("../api/procedures/utils");
 const utils_2 = require("../generated/utils");
 const internal_1 = require("../internal");
-const enumsV2_1 = require("../middleware/enumsV2");
-const types_1 = require("../middleware/types");
-const types_2 = require("../types");
+const enums_1 = require("../middleware/enums");
+const typesV1_1 = require("../middleware/typesV1");
+const types_1 = require("../types");
 const internal_2 = require("../types/internal");
 const utils_3 = require("../types/utils");
 const constants_1 = require("./constants");
@@ -189,9 +189,9 @@ function createSignerValue(type, value) {
  */
 function signatoryToSignerValue(signatory) {
     if (signatory.isAccount) {
-        return createSignerValue(types_2.SignerType.Account, accountIdToString(signatory.asAccount));
+        return createSignerValue(types_1.SignerType.Account, accountIdToString(signatory.asAccount));
     }
-    return createSignerValue(types_2.SignerType.Identity, identityIdToString(signatory.asIdentity));
+    return createSignerValue(types_1.SignerType.Identity, identityIdToString(signatory.asIdentity));
 }
 exports.signatoryToSignerValue = signatoryToSignerValue;
 /**
@@ -199,9 +199,9 @@ exports.signatoryToSignerValue = signatoryToSignerValue;
  */
 function signerToSignerValue(signer) {
     if (signer instanceof internal_1.Account) {
-        return createSignerValue(types_2.SignerType.Account, signer.address);
+        return createSignerValue(types_1.SignerType.Account, signer.address);
     }
-    return createSignerValue(types_2.SignerType.Identity, signer.did);
+    return createSignerValue(types_1.SignerType.Identity, signer.did);
 }
 exports.signerToSignerValue = signerToSignerValue;
 /**
@@ -209,7 +209,7 @@ exports.signerToSignerValue = signerToSignerValue;
  */
 function signerValueToSigner(signerValue, context) {
     const { type, value } = signerValue;
-    if (type === types_2.SignerType.Account) {
+    if (type === types_1.SignerType.Account) {
         return new internal_1.Account({ address: value }, context);
     }
     return new internal_1.Identity({ did: value }, context);
@@ -271,7 +271,7 @@ function percentageToPermill(value, context) {
     (0, internal_3.assertIsPositive)(value);
     if (value.gt(100)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: "Percentage shouldn't exceed 100",
         });
     }
@@ -293,19 +293,19 @@ exports.permillToBigNumber = permillToBigNumber;
 function meshClaimToInputStatClaim(claim) {
     if (claim.isAccredited) {
         return {
-            type: types_2.ClaimType.Accredited,
+            type: types_1.ClaimType.Accredited,
             accredited: boolToBoolean(claim.asAccredited),
         };
     }
     else if (claim.isAffiliate) {
         return {
-            type: types_2.ClaimType.Affiliate,
+            type: types_1.ClaimType.Affiliate,
             affiliate: boolToBoolean(claim.asAffiliate),
         };
     }
     else {
         return {
-            type: types_2.ClaimType.Jurisdiction,
+            type: types_1.ClaimType.Jurisdiction,
             countryCode: claim.asJurisdiction.isSome
                 ? (0, utils_2.meshCountryCodeToCountryCode)(claim.asJurisdiction.unwrap())
                 : undefined,
@@ -449,89 +449,89 @@ exports.textToString = textToString;
  */
 function txGroupToTxTags(group) {
     switch (group) {
-        case types_2.TxGroup.PortfolioManagement: {
+        case types_1.TxGroup.PortfolioManagement: {
             return [
-                types_2.TxTags.identity.AddInvestorUniquenessClaim,
-                types_2.TxTags.portfolio.MovePortfolioFunds,
-                types_2.TxTags.settlement.AddInstruction,
-                types_2.TxTags.settlement.AddInstructionWithMemo,
-                types_2.TxTags.settlement.AddAndAffirmInstruction,
-                types_2.TxTags.settlement.AddAndAffirmInstructionWithMemo,
-                types_2.TxTags.settlement.AffirmInstruction,
-                types_2.TxTags.settlement.RejectInstruction,
-                types_2.TxTags.settlement.CreateVenue,
+                types_1.TxTags.identity.AddInvestorUniquenessClaim,
+                types_1.TxTags.portfolio.MovePortfolioFunds,
+                types_1.TxTags.settlement.AddInstruction,
+                types_1.TxTags.settlement.AddInstructionWithMemo,
+                types_1.TxTags.settlement.AddAndAffirmInstruction,
+                types_1.TxTags.settlement.AddAndAffirmInstructionWithMemo,
+                types_1.TxTags.settlement.AffirmInstruction,
+                types_1.TxTags.settlement.RejectInstruction,
+                types_1.TxTags.settlement.CreateVenue,
             ];
         }
-        case types_2.TxGroup.AssetManagement: {
+        case types_1.TxGroup.AssetManagement: {
             return [
-                types_2.TxTags.asset.MakeDivisible,
-                types_2.TxTags.asset.RenameAsset,
-                types_2.TxTags.asset.SetFundingRound,
-                types_2.TxTags.asset.AddDocuments,
-                types_2.TxTags.asset.RemoveDocuments,
+                types_1.TxTags.asset.MakeDivisible,
+                types_1.TxTags.asset.RenameAsset,
+                types_1.TxTags.asset.SetFundingRound,
+                types_1.TxTags.asset.AddDocuments,
+                types_1.TxTags.asset.RemoveDocuments,
             ];
         }
-        case types_2.TxGroup.AdvancedAssetManagement: {
+        case types_1.TxGroup.AdvancedAssetManagement: {
             return [
-                types_2.TxTags.asset.Freeze,
-                types_2.TxTags.asset.Unfreeze,
-                types_2.TxTags.identity.AddAuthorization,
-                types_2.TxTags.identity.RemoveAuthorization,
+                types_1.TxTags.asset.Freeze,
+                types_1.TxTags.asset.Unfreeze,
+                types_1.TxTags.identity.AddAuthorization,
+                types_1.TxTags.identity.RemoveAuthorization,
             ];
         }
-        case types_2.TxGroup.Distribution: {
+        case types_1.TxGroup.Distribution: {
             return [
-                types_2.TxTags.identity.AddInvestorUniquenessClaim,
-                types_2.TxTags.settlement.CreateVenue,
-                types_2.TxTags.settlement.AddInstruction,
-                types_2.TxTags.settlement.AddInstructionWithMemo,
-                types_2.TxTags.settlement.AddAndAffirmInstruction,
-                types_2.TxTags.settlement.AddAndAffirmInstructionWithMemo,
+                types_1.TxTags.identity.AddInvestorUniquenessClaim,
+                types_1.TxTags.settlement.CreateVenue,
+                types_1.TxTags.settlement.AddInstruction,
+                types_1.TxTags.settlement.AddInstructionWithMemo,
+                types_1.TxTags.settlement.AddAndAffirmInstruction,
+                types_1.TxTags.settlement.AddAndAffirmInstructionWithMemo,
             ];
         }
-        case types_2.TxGroup.Issuance: {
-            return [types_2.TxTags.asset.Issue];
+        case types_1.TxGroup.Issuance: {
+            return [types_1.TxTags.asset.Issue];
         }
-        case types_2.TxGroup.TrustedClaimIssuersManagement: {
+        case types_1.TxGroup.TrustedClaimIssuersManagement: {
             return [
-                types_2.TxTags.complianceManager.AddDefaultTrustedClaimIssuer,
-                types_2.TxTags.complianceManager.RemoveDefaultTrustedClaimIssuer,
+                types_1.TxTags.complianceManager.AddDefaultTrustedClaimIssuer,
+                types_1.TxTags.complianceManager.RemoveDefaultTrustedClaimIssuer,
             ];
         }
-        case types_2.TxGroup.ClaimsManagement: {
-            return [types_2.TxTags.identity.AddClaim, types_2.TxTags.identity.RevokeClaim];
+        case types_1.TxGroup.ClaimsManagement: {
+            return [types_1.TxTags.identity.AddClaim, types_1.TxTags.identity.RevokeClaim];
         }
-        case types_2.TxGroup.ComplianceRequirementsManagement: {
+        case types_1.TxGroup.ComplianceRequirementsManagement: {
             return [
-                types_2.TxTags.complianceManager.AddComplianceRequirement,
-                types_2.TxTags.complianceManager.RemoveComplianceRequirement,
-                types_2.TxTags.complianceManager.PauseAssetCompliance,
-                types_2.TxTags.complianceManager.ResumeAssetCompliance,
-                types_2.TxTags.complianceManager.ResetAssetCompliance,
+                types_1.TxTags.complianceManager.AddComplianceRequirement,
+                types_1.TxTags.complianceManager.RemoveComplianceRequirement,
+                types_1.TxTags.complianceManager.PauseAssetCompliance,
+                types_1.TxTags.complianceManager.ResumeAssetCompliance,
+                types_1.TxTags.complianceManager.ResetAssetCompliance,
             ];
         }
-        case types_2.TxGroup.CorporateActionsManagement: {
+        case types_1.TxGroup.CorporateActionsManagement: {
             return [
-                types_2.TxTags.checkpoint.CreateSchedule,
-                types_2.TxTags.checkpoint.RemoveSchedule,
-                types_2.TxTags.checkpoint.CreateCheckpoint,
-                types_2.TxTags.corporateAction.InitiateCorporateAction,
-                types_2.TxTags.capitalDistribution.Distribute,
-                types_2.TxTags.capitalDistribution.Claim,
-                types_2.TxTags.identity.AddInvestorUniquenessClaim,
+                types_1.TxTags.checkpoint.CreateSchedule,
+                types_1.TxTags.checkpoint.RemoveSchedule,
+                types_1.TxTags.checkpoint.CreateCheckpoint,
+                types_1.TxTags.corporateAction.InitiateCorporateAction,
+                types_1.TxTags.capitalDistribution.Distribute,
+                types_1.TxTags.capitalDistribution.Claim,
+                types_1.TxTags.identity.AddInvestorUniquenessClaim,
             ];
         }
-        case types_2.TxGroup.StoManagement: {
+        case types_1.TxGroup.StoManagement: {
             return [
-                types_2.TxTags.sto.CreateFundraiser,
-                types_2.TxTags.sto.FreezeFundraiser,
-                types_2.TxTags.sto.Invest,
-                types_2.TxTags.sto.ModifyFundraiserWindow,
-                types_2.TxTags.sto.Stop,
-                types_2.TxTags.sto.UnfreezeFundraiser,
-                types_2.TxTags.identity.AddInvestorUniquenessClaim,
-                types_2.TxTags.asset.Issue,
-                types_2.TxTags.settlement.CreateVenue,
+                types_1.TxTags.sto.CreateFundraiser,
+                types_1.TxTags.sto.FreezeFundraiser,
+                types_1.TxTags.sto.Invest,
+                types_1.TxTags.sto.ModifyFundraiserWindow,
+                types_1.TxTags.sto.Stop,
+                types_1.TxTags.sto.UnfreezeFundraiser,
+                types_1.TxTags.identity.AddInvestorUniquenessClaim,
+                types_1.TxTags.asset.Issue,
+                types_1.TxTags.settlement.CreateVenue,
             ];
         }
     }
@@ -550,7 +550,7 @@ function transactionPermissionsToTxGroups(permissions) {
     const { values: transactionValues, type, exceptions = [] } = permissions;
     let includedTags;
     let excludedTags;
-    if (type === types_2.PermissionType.Include) {
+    if (type === types_1.PermissionType.Include) {
         includedTags = transactionValues;
         excludedTags = exceptions;
     }
@@ -558,7 +558,7 @@ function transactionPermissionsToTxGroups(permissions) {
         includedTags = exceptions;
         excludedTags = transactionValues;
     }
-    return (0, lodash_1.values)(types_2.TxGroup)
+    return (0, lodash_1.values)(types_1.TxGroup)
         .sort()
         .filter(group => {
         const tagsInGroup = txGroupToTxTags(group);
@@ -594,7 +594,7 @@ function initExtrinsicDict(txValues, message) {
             let pallet = extrinsicDict[palletName];
             if (pallet === null) {
                 throw new internal_1.PolymeshError({
-                    code: types_2.ErrorCode.ValidationError,
+                    code: types_1.ErrorCode.ValidationError,
                     message,
                     data: {
                         module: palletName,
@@ -626,7 +626,7 @@ function buildPalletPermissions(transactions) {
         const pallet = extrinsicDict[palletName];
         if (pallet === undefined) {
             throw new internal_1.PolymeshError({
-                code: types_2.ErrorCode.ValidationError,
+                code: types_1.ErrorCode.ValidationError,
                 message: 'Attempting to add a transaction permission exception without its corresponding module being included/excluded',
             });
         }
@@ -638,7 +638,7 @@ function buildPalletPermissions(transactions) {
         }
         else {
             throw new internal_1.PolymeshError({
-                code: types_2.ErrorCode.ValidationError,
+                code: types_1.ErrorCode.ValidationError,
                 message: 'Cannot simultaneously include and exclude transactions belonging to the same module',
             });
         }
@@ -668,7 +668,7 @@ function buildPalletPermissions(transactions) {
             /* eslint-enable @typescript-eslint/naming-convention */
         };
     });
-    if (type === types_2.PermissionType.Include) {
+    if (type === types_1.PermissionType.Include) {
         extrinsic = {
             These: pallets,
         };
@@ -698,7 +698,7 @@ function permissionsToMeshPermissions(permissions, context) {
         const { values: assetValues, type } = assets;
         assetValues.sort(({ ticker: tickerA }, { ticker: tickerB }) => tickerA.localeCompare(tickerB));
         const tickers = assetValues.map(({ ticker }) => stringToTicker(ticker, context));
-        if (type === types_2.PermissionType.Include) {
+        if (type === types_1.PermissionType.Include) {
             asset = {
                 These: tickers,
             };
@@ -713,7 +713,7 @@ function permissionsToMeshPermissions(permissions, context) {
     if (portfolios) {
         const { values: portfolioValues, type } = portfolios;
         const portfolioIds = portfolioValues.map(pValue => portfolioIdToMeshPortfolioId(portfolioToPortfolioId(pValue), context));
-        if (type === types_2.PermissionType.Include) {
+        if (type === types_1.PermissionType.Include) {
             portfolio = {
                 These: portfolioIds,
             };
@@ -742,11 +742,11 @@ function extrinsicPermissionsToTransactionPermissions(permissions) {
     let extrinsicType;
     let pallets;
     if (permissions.isThese) {
-        extrinsicType = types_2.PermissionType.Include;
+        extrinsicType = types_1.PermissionType.Include;
         pallets = permissions.asThese;
     }
     else if (permissions.isExcept) {
-        extrinsicType = types_2.PermissionType.Exclude;
+        extrinsicType = types_1.PermissionType.Exclude;
         pallets = permissions.asExcept;
     }
     let txValues = [];
@@ -794,11 +794,11 @@ function meshPermissionsToPermissions(permissions, context) {
     let assetsType;
     let assetsPermissions;
     if (asset.isThese) {
-        assetsType = types_2.PermissionType.Include;
+        assetsType = types_1.PermissionType.Include;
         assetsPermissions = asset.asThese;
     }
     else if (asset.isExcept) {
-        assetsType = types_2.PermissionType.Exclude;
+        assetsType = types_1.PermissionType.Exclude;
         assetsPermissions = asset.asExcept;
     }
     if (assetsPermissions) {
@@ -812,11 +812,11 @@ function meshPermissionsToPermissions(permissions, context) {
     let portfoliosType;
     let portfolioIds;
     if (portfolio.isThese) {
-        portfoliosType = types_2.PermissionType.Include;
+        portfoliosType = types_1.PermissionType.Include;
         portfolioIds = portfolio.asThese;
     }
     else if (portfolio.isExcept) {
-        portfoliosType = types_2.PermissionType.Exclude;
+        portfoliosType = types_1.PermissionType.Exclude;
         portfolioIds = portfolio.asExcept;
     }
     if (portfolioIds) {
@@ -878,16 +878,16 @@ exports.permissionGroupIdentifierToAgentGroup = permissionGroupIdentifierToAgent
  */
 function agentGroupToPermissionGroupIdentifier(agentGroup) {
     if (agentGroup.isFull) {
-        return types_2.PermissionGroupType.Full;
+        return types_1.PermissionGroupType.Full;
     }
     else if (agentGroup.isExceptMeta) {
-        return types_2.PermissionGroupType.ExceptMeta;
+        return types_1.PermissionGroupType.ExceptMeta;
     }
     else if (agentGroup.isPolymeshV1CAA) {
-        return types_2.PermissionGroupType.PolymeshV1Caa;
+        return types_1.PermissionGroupType.PolymeshV1Caa;
     }
     else if (agentGroup.isPolymeshV1PIA) {
-        return types_2.PermissionGroupType.PolymeshV1Pia;
+        return types_1.PermissionGroupType.PolymeshV1Pia;
     }
     else {
         return { custom: u32ToBigNumber(agentGroup.asCustom) };
@@ -900,26 +900,26 @@ exports.agentGroupToPermissionGroupIdentifier = agentGroupToPermissionGroupIdent
 function authorizationToAuthorizationData(auth, context) {
     let value;
     const { type } = auth;
-    if (type === types_2.AuthorizationType.AttestPrimaryKeyRotation) {
+    if (type === types_1.AuthorizationType.AttestPrimaryKeyRotation) {
         value = stringToIdentityId(auth.value.did, context);
     }
-    else if (type === types_2.AuthorizationType.RotatePrimaryKey) {
+    else if (type === types_1.AuthorizationType.RotatePrimaryKey) {
         value = null;
     }
-    else if (type === types_2.AuthorizationType.JoinIdentity) {
+    else if (type === types_1.AuthorizationType.JoinIdentity) {
         value = permissionsToMeshPermissions(auth.value, context);
     }
-    else if (type === types_2.AuthorizationType.PortfolioCustody) {
+    else if (type === types_1.AuthorizationType.PortfolioCustody) {
         value = portfolioIdToMeshPortfolioId(portfolioToPortfolioId(auth.value), context);
     }
-    else if (auth.type === types_2.AuthorizationType.TransferAssetOwnership ||
-        auth.type === types_2.AuthorizationType.TransferTicker) {
+    else if (auth.type === types_1.AuthorizationType.TransferAssetOwnership ||
+        auth.type === types_1.AuthorizationType.TransferTicker) {
         value = stringToTicker(auth.value, context);
     }
-    else if (type === types_2.AuthorizationType.RotatePrimaryKeyToSecondary) {
+    else if (type === types_1.AuthorizationType.RotatePrimaryKeyToSecondary) {
         value = permissionsToMeshPermissions(auth.value, context);
     }
-    else if (type === types_2.AuthorizationType.BecomeAgent) {
+    else if (type === types_1.AuthorizationType.BecomeAgent) {
         const ticker = stringToTicker(auth.value.asset.ticker, context);
         if (auth.value instanceof internal_1.CustomPermissionGroup) {
             const { id } = auth.value;
@@ -952,7 +952,7 @@ function bigNumberToBalance(value, context, divisible = true) {
     (0, internal_3.assertIsPositive)(value);
     if (value.isGreaterThan(constants_1.MAX_BALANCE)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'The value exceeds the maximum possible balance',
             data: {
                 currentValue: value,
@@ -963,7 +963,7 @@ function bigNumberToBalance(value, context, divisible = true) {
     if (divisible) {
         if (value.decimalPlaces() > constants_1.MAX_DECIMALS) {
             throw new internal_1.PolymeshError({
-                code: types_2.ErrorCode.ValidationError,
+                code: types_1.ErrorCode.ValidationError,
                 message: 'The value has more decimal places than allowed',
                 data: {
                     currentValue: value,
@@ -975,7 +975,7 @@ function bigNumberToBalance(value, context, divisible = true) {
     else {
         if (value.decimalPlaces()) {
             throw new internal_1.PolymeshError({
-                code: types_2.ErrorCode.ValidationError,
+                code: types_1.ErrorCode.ValidationError,
                 message: 'The value has decimals but the Asset is indivisible',
             });
         }
@@ -995,10 +995,10 @@ exports.balanceToBigNumber = balanceToBigNumber;
  */
 function assemblePermissionGroup(permissionGroupIdentifier, ticker, context) {
     switch (permissionGroupIdentifier) {
-        case types_2.PermissionGroupType.ExceptMeta:
-        case types_2.PermissionGroupType.Full:
-        case types_2.PermissionGroupType.PolymeshV1Caa:
-        case types_2.PermissionGroupType.PolymeshV1Pia: {
+        case types_1.PermissionGroupType.ExceptMeta:
+        case types_1.PermissionGroupType.Full:
+        case types_1.PermissionGroupType.PolymeshV1Caa:
+        case types_1.PermissionGroupType.PolymeshV1Pia: {
             return new internal_1.KnownPermissionGroup({ type: permissionGroupIdentifier, ticker }, context);
         }
         default: {
@@ -1021,7 +1021,7 @@ exports.agentGroupToPermissionGroup = agentGroupToPermissionGroup;
 function authorizationDataToAuthorization(auth, context) {
     if (auth.isAttestPrimaryKeyRotation) {
         return {
-            type: types_2.AuthorizationType.AttestPrimaryKeyRotation,
+            type: types_1.AuthorizationType.AttestPrimaryKeyRotation,
             value: new internal_1.Identity({
                 did: identityIdToString(auth.asAttestPrimaryKeyRotation),
             }, context),
@@ -1029,43 +1029,43 @@ function authorizationDataToAuthorization(auth, context) {
     }
     if (auth.isRotatePrimaryKey) {
         return {
-            type: types_2.AuthorizationType.RotatePrimaryKey,
+            type: types_1.AuthorizationType.RotatePrimaryKey,
         };
     }
     if (auth.isTransferTicker) {
         return {
-            type: types_2.AuthorizationType.TransferTicker,
+            type: types_1.AuthorizationType.TransferTicker,
             value: tickerToString(auth.asTransferTicker),
         };
     }
     if (auth.isAddMultiSigSigner) {
         return {
-            type: types_2.AuthorizationType.AddMultiSigSigner,
+            type: types_1.AuthorizationType.AddMultiSigSigner,
             value: accountIdToString(auth.asAddMultiSigSigner),
         };
     }
     if (auth.isTransferAssetOwnership) {
         return {
-            type: types_2.AuthorizationType.TransferAssetOwnership,
+            type: types_1.AuthorizationType.TransferAssetOwnership,
             value: tickerToString(auth.asTransferAssetOwnership),
         };
     }
     if (auth.isPortfolioCustody) {
         return {
-            type: types_2.AuthorizationType.PortfolioCustody,
+            type: types_1.AuthorizationType.PortfolioCustody,
             value: meshPortfolioIdToPortfolio(auth.asPortfolioCustody, context),
         };
     }
     if (auth.isJoinIdentity) {
         return {
-            type: types_2.AuthorizationType.JoinIdentity,
+            type: types_1.AuthorizationType.JoinIdentity,
             value: meshPermissionsToPermissions(auth.asJoinIdentity, context),
         };
     }
     if (auth.isAddRelayerPayingKey) {
         const [userKey, payingKey, polyxLimit] = auth.asAddRelayerPayingKey;
         return {
-            type: types_2.AuthorizationType.AddRelayerPayingKey,
+            type: types_1.AuthorizationType.AddRelayerPayingKey,
             value: {
                 beneficiary: new internal_1.Account({ address: accountIdToString(userKey) }, context),
                 subsidizer: new internal_1.Account({ address: accountIdToString(payingKey) }, context),
@@ -1076,18 +1076,18 @@ function authorizationDataToAuthorization(auth, context) {
     if (auth.isBecomeAgent) {
         const [ticker, agentGroup] = auth.asBecomeAgent;
         return {
-            type: types_2.AuthorizationType.BecomeAgent,
+            type: types_1.AuthorizationType.BecomeAgent,
             value: agentGroupToPermissionGroup(agentGroup, tickerToString(ticker), context),
         };
     }
     if (auth.isRotatePrimaryKeyToSecondary) {
         return {
-            type: types_2.AuthorizationType.RotatePrimaryKeyToSecondary,
+            type: types_1.AuthorizationType.RotatePrimaryKeyToSecondary,
             value: meshPermissionsToPermissions(auth.asRotatePrimaryKeyToSecondary, context),
         };
     }
     throw new internal_1.PolymeshError({
-        code: types_2.ErrorCode.UnexpectedError,
+        code: types_1.ErrorCode.UnexpectedError,
         message: 'Unsupported Authorization Type. Please contact the Polymesh team',
         data: {
             auth: JSON.stringify(auth, null, 2),
@@ -1101,7 +1101,7 @@ exports.authorizationDataToAuthorization = authorizationDataToAuthorization;
 function assertMemoValid(value) {
     if (value.length > constants_1.MAX_MEMO_LENGTH) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Max memo length exceeded',
             data: {
                 maxLength: constants_1.MAX_MEMO_LENGTH,
@@ -1129,71 +1129,71 @@ function u8ToTransferStatus(status) {
     const code = status.toNumber();
     switch (code) {
         case 81: {
-            return types_2.TransferStatus.Success;
+            return types_1.TransferStatus.Success;
         }
         case 82: {
-            return types_2.TransferStatus.InsufficientBalance;
+            return types_1.TransferStatus.InsufficientBalance;
         }
         case 83: {
-            return types_2.TransferStatus.InsufficientAllowance;
+            return types_1.TransferStatus.InsufficientAllowance;
         }
         case 84: {
-            return types_2.TransferStatus.TransfersHalted;
+            return types_1.TransferStatus.TransfersHalted;
         }
         case 85: {
-            return types_2.TransferStatus.FundsLocked;
+            return types_1.TransferStatus.FundsLocked;
         }
         case 86: {
-            return types_2.TransferStatus.InvalidSenderAddress;
+            return types_1.TransferStatus.InvalidSenderAddress;
         }
         case 87: {
-            return types_2.TransferStatus.InvalidReceiverAddress;
+            return types_1.TransferStatus.InvalidReceiverAddress;
         }
         case 88: {
-            return types_2.TransferStatus.InvalidOperator;
+            return types_1.TransferStatus.InvalidOperator;
         }
         case 160: {
-            return types_2.TransferStatus.InvalidSenderIdentity;
+            return types_1.TransferStatus.InvalidSenderIdentity;
         }
         case 161: {
-            return types_2.TransferStatus.InvalidReceiverIdentity;
+            return types_1.TransferStatus.InvalidReceiverIdentity;
         }
         case 162: {
-            return types_2.TransferStatus.ComplianceFailure;
+            return types_1.TransferStatus.ComplianceFailure;
         }
         case 163: {
-            return types_2.TransferStatus.SmartExtensionFailure;
+            return types_1.TransferStatus.SmartExtensionFailure;
         }
         case 164: {
-            return types_2.TransferStatus.InvalidGranularity;
+            return types_1.TransferStatus.InvalidGranularity;
         }
         case 165: {
-            return types_2.TransferStatus.VolumeLimitReached;
+            return types_1.TransferStatus.VolumeLimitReached;
         }
         case 166: {
-            return types_2.TransferStatus.BlockedTransaction;
+            return types_1.TransferStatus.BlockedTransaction;
         }
         case 168: {
-            return types_2.TransferStatus.FundsLimitReached;
+            return types_1.TransferStatus.FundsLimitReached;
         }
         case 169: {
-            return types_2.TransferStatus.PortfolioFailure;
+            return types_1.TransferStatus.PortfolioFailure;
         }
         case 170: {
-            return types_2.TransferStatus.CustodianError;
+            return types_1.TransferStatus.CustodianError;
         }
         case 171: {
-            return types_2.TransferStatus.ScopeClaimMissing;
+            return types_1.TransferStatus.ScopeClaimMissing;
         }
         case 172: {
-            return types_2.TransferStatus.TransferRestrictionFailure;
+            return types_1.TransferStatus.TransferRestrictionFailure;
         }
         case 80: {
-            return types_2.TransferStatus.Failure;
+            return types_1.TransferStatus.Failure;
         }
         default: {
             throw new internal_1.PolymeshError({
-                code: types_2.ErrorCode.UnexpectedError,
+                code: types_1.ErrorCode.UnexpectedError,
                 message: `Unsupported status code "${status.toString()}". Please report this issue to the Polymesh team`,
             });
         }
@@ -1212,34 +1212,34 @@ exports.internalAssetTypeToAssetType = internalAssetTypeToAssetType;
  */
 function assetTypeToKnownOrId(assetType) {
     if (assetType.isEquityCommon) {
-        return types_2.KnownAssetType.EquityCommon;
+        return types_1.KnownAssetType.EquityCommon;
     }
     if (assetType.isEquityPreferred) {
-        return types_2.KnownAssetType.EquityPreferred;
+        return types_1.KnownAssetType.EquityPreferred;
     }
     if (assetType.isCommodity) {
-        return types_2.KnownAssetType.Commodity;
+        return types_1.KnownAssetType.Commodity;
     }
     if (assetType.isFixedIncome) {
-        return types_2.KnownAssetType.FixedIncome;
+        return types_1.KnownAssetType.FixedIncome;
     }
     if (assetType.isReit) {
-        return types_2.KnownAssetType.Reit;
+        return types_1.KnownAssetType.Reit;
     }
     if (assetType.isFund) {
-        return types_2.KnownAssetType.Fund;
+        return types_1.KnownAssetType.Fund;
     }
     if (assetType.isRevenueShareAgreement) {
-        return types_2.KnownAssetType.RevenueShareAgreement;
+        return types_1.KnownAssetType.RevenueShareAgreement;
     }
     if (assetType.isStructuredProduct) {
-        return types_2.KnownAssetType.StructuredProduct;
+        return types_1.KnownAssetType.StructuredProduct;
     }
     if (assetType.isDerivative) {
-        return types_2.KnownAssetType.Derivative;
+        return types_1.KnownAssetType.Derivative;
     }
     if (assetType.isStableCoin) {
-        return types_2.KnownAssetType.StableCoin;
+        return types_1.KnownAssetType.StableCoin;
     }
     return u32ToBigNumber(assetType.asCustom);
 }
@@ -1260,7 +1260,7 @@ function nameToAssetName(value, context) {
     const nameMaxLength = u32ToBigNumber(assetNameMaxLength);
     if (nameMaxLength.lt(value.length)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Asset name length exceeded',
             data: {
                 maxLength: nameMaxLength,
@@ -1278,7 +1278,7 @@ function fundingRoundToAssetFundingRound(value, context) {
     const nameMaxLength = u32ToBigNumber(fundingRoundNameMaxLength);
     if (nameMaxLength.lt(value.length)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Asset funding round name length exceeded',
             data: {
                 maxLength: nameMaxLength,
@@ -1398,19 +1398,19 @@ function securityIdentifierToAssetIdentifier(identifier, context) {
     const { type, value } = identifier;
     let error = false;
     switch (type) {
-        case types_2.SecurityIdentifierType.Isin: {
+        case types_1.SecurityIdentifierType.Isin: {
             if (!isIsinValid(value)) {
                 error = true;
             }
             break;
         }
-        case types_2.SecurityIdentifierType.Lei: {
+        case types_1.SecurityIdentifierType.Lei: {
             if (!isLeiValid(value)) {
                 error = true;
             }
             break;
         }
-        case types_2.SecurityIdentifierType.Figi: {
+        case types_1.SecurityIdentifierType.Figi: {
             if (!isFigiValid(value)) {
                 error = true;
             }
@@ -1425,7 +1425,7 @@ function securityIdentifierToAssetIdentifier(identifier, context) {
     }
     if (error) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: `Invalid security identifier ${value} of type ${type}`,
         });
     }
@@ -1438,30 +1438,30 @@ exports.securityIdentifierToAssetIdentifier = securityIdentifierToAssetIdentifie
 function assetIdentifierToSecurityIdentifier(identifier) {
     if (identifier.isCusip) {
         return {
-            type: types_2.SecurityIdentifierType.Cusip,
+            type: types_1.SecurityIdentifierType.Cusip,
             value: (0, util_1.u8aToString)(identifier.asCusip),
         };
     }
     if (identifier.isIsin) {
         return {
-            type: types_2.SecurityIdentifierType.Isin,
+            type: types_1.SecurityIdentifierType.Isin,
             value: (0, util_1.u8aToString)(identifier.asIsin),
         };
     }
     if (identifier.isCins) {
         return {
-            type: types_2.SecurityIdentifierType.Cins,
+            type: types_1.SecurityIdentifierType.Cins,
             value: (0, util_1.u8aToString)(identifier.asCins),
         };
     }
     if (identifier.isFigi) {
         return {
-            type: types_2.SecurityIdentifierType.Figi,
+            type: types_1.SecurityIdentifierType.Figi,
             value: (0, util_1.u8aToString)(identifier.asFigi),
         };
     }
     return {
-        type: types_2.SecurityIdentifierType.Lei,
+        type: types_1.SecurityIdentifierType.Lei,
         value: (0, util_1.u8aToString)(identifier.asLei),
     };
 }
@@ -1475,7 +1475,7 @@ function stringToDocumentHash(docHash, context) {
     }
     if (!(0, util_1.isHex)(docHash, -1, true)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Document hash must be a hexadecimal string prefixed by 0x',
         });
     }
@@ -1488,7 +1488,7 @@ function stringToDocumentHash(docHash, context) {
     const type = hashTypes.find(({ maxLength: max }) => length <= max);
     if (!type) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Document hash exceeds max length',
         });
     }
@@ -1581,7 +1581,7 @@ exports.cddStatusToBoolean = cddStatusToBoolean;
 function canTransferResultToTransferStatus(canTransferResult) {
     if (canTransferResult.isErr) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.UnexpectedError,
+            code: types_1.ErrorCode.UnexpectedError,
             message: `Error while checking transfer validity: ${bytesToString(canTransferResult.asErr)}`,
         });
     }
@@ -1595,10 +1595,10 @@ function scopeToMeshScope(scope, context) {
     const { type, value } = scope;
     let scopeValue;
     switch (type) {
-        case types_2.ScopeType.Ticker:
+        case types_1.ScopeType.Ticker:
             scopeValue = stringToTicker(value, context);
             break;
-        case types_2.ScopeType.Identity:
+        case types_1.ScopeType.Identity:
             scopeValue = stringToIdentityId(value, context);
             break;
         default:
@@ -1616,18 +1616,18 @@ exports.scopeToMeshScope = scopeToMeshScope;
 function meshScopeToScope(scope) {
     if (scope.isTicker) {
         return {
-            type: types_2.ScopeType.Ticker,
+            type: types_1.ScopeType.Ticker,
             value: tickerToString(scope.asTicker),
         };
     }
     if (scope.isIdentity) {
         return {
-            type: types_2.ScopeType.Identity,
+            type: types_1.ScopeType.Identity,
             value: identityIdToString(scope.asIdentity),
         };
     }
     return {
-        type: types_2.ScopeType.Custom,
+        type: types_1.ScopeType.Custom,
         value: (0, util_1.u8aToString)(scope.asCustom),
     };
 }
@@ -1652,11 +1652,11 @@ exports.cddIdToString = cddIdToString;
 function claimToMeshClaim(claim, context) {
     let value;
     switch (claim.type) {
-        case types_2.ClaimType.CustomerDueDiligence: {
+        case types_1.ClaimType.CustomerDueDiligence: {
             value = stringToCddId(claim.id, context);
             break;
         }
-        case types_2.ClaimType.Jurisdiction: {
+        case types_1.ClaimType.Jurisdiction: {
             const { code, scope } = claim;
             value = (0, utils_3.tuple)(code, scopeToMeshScope(scope, context));
             break;
@@ -1674,13 +1674,19 @@ exports.claimToMeshClaim = claimToMeshClaim;
 function middlewareScopeToScope(scope) {
     const { type, value } = scope;
     switch (type) {
-        case types_1.ClaimScopeTypeEnum.Ticker:
-            // eslint-disable-next-line no-control-regex
-            return { type: types_2.ScopeType.Ticker, value: (0, internal_3.removePadding)(value) };
-        case types_1.ClaimScopeTypeEnum.Identity:
-        case types_1.ClaimScopeTypeEnum.Custom:
-            return { type: types_2.ScopeType[scope.type], value };
+        case typesV1_1.ClaimScopeTypeEnum.Ticker:
+            return { type: types_1.ScopeType.Ticker, value: (0, internal_3.removePadding)(value) };
+        case typesV1_1.ClaimScopeTypeEnum.Identity:
+        case typesV1_1.ClaimScopeTypeEnum.Custom:
+            return { type: scope.type, value };
     }
+    throw new internal_1.PolymeshError({
+        code: types_1.ErrorCode.UnexpectedError,
+        message: 'Unsupported Scope Type. Please contact the Polymesh team',
+        data: {
+            scope,
+        },
+    });
 }
 exports.middlewareScopeToScope = middlewareScopeToScope;
 /**
@@ -1689,36 +1695,21 @@ exports.middlewareScopeToScope = middlewareScopeToScope;
 function scopeToMiddlewareScope(scope, padTicker = true) {
     const { type, value } = scope;
     switch (type) {
-        case types_2.ScopeType.Ticker:
+        case types_1.ScopeType.Ticker:
             return {
-                type: types_1.ClaimScopeTypeEnum.Ticker,
+                type: typesV1_1.ClaimScopeTypeEnum.Ticker,
                 value: padTicker ? (0, lodash_1.padEnd)(value, 12, '\0') : value,
             };
-        case types_2.ScopeType.Identity:
-        case types_2.ScopeType.Custom:
-            return { type: types_1.ClaimScopeTypeEnum[scope.type], value };
+        case types_1.ScopeType.Identity:
+        case types_1.ScopeType.Custom:
+            return { type: typesV1_1.ClaimScopeTypeEnum[scope.type], value };
     }
 }
 exports.scopeToMiddlewareScope = scopeToMiddlewareScope;
 /**
  * @hidden
  */
-function middlewareEventToEventIdentifier(event) {
-    const { block_id: blockNumber, block, event_idx: eventIndex } = event;
-    return {
-        blockNumber: new bignumber_js_1.default(blockNumber),
-        /* eslint-disable @typescript-eslint/no-non-null-assertion */
-        blockDate: new Date(block.datetime),
-        blockHash: block.hash,
-        /* eslint-enable @typescript-eslint/no-non-null-assertion */
-        eventIndex: new bignumber_js_1.default(eventIndex),
-    };
-}
-exports.middlewareEventToEventIdentifier = middlewareEventToEventIdentifier;
-/**
- * @hidden
- */
-function middlewareV2EventDetailsToEventIdentifier(block, eventIdx = 0) {
+function middlewareEventDetailsToEventIdentifier(block, eventIdx = 0) {
     const { blockId, datetime, hash } = block;
     return {
         blockNumber: new bignumber_js_1.default(blockId),
@@ -1727,7 +1718,7 @@ function middlewareV2EventDetailsToEventIdentifier(block, eventIdx = 0) {
         eventIndex: new bignumber_js_1.default(eventIdx),
     };
 }
-exports.middlewareV2EventDetailsToEventIdentifier = middlewareV2EventDetailsToEventIdentifier;
+exports.middlewareEventDetailsToEventIdentifier = middlewareEventDetailsToEventIdentifier;
 /**
  * @hidden
  */
@@ -1735,55 +1726,55 @@ function meshClaimToClaim(claim) {
     if (claim.isJurisdiction) {
         const [code, scope] = claim.asJurisdiction;
         return {
-            type: types_2.ClaimType.Jurisdiction,
+            type: types_1.ClaimType.Jurisdiction,
             code: (0, utils_2.meshCountryCodeToCountryCode)(code),
             scope: meshScopeToScope(scope),
         };
     }
     if (claim.isAccredited) {
         return {
-            type: types_2.ClaimType.Accredited,
+            type: types_1.ClaimType.Accredited,
             scope: meshScopeToScope(claim.asAccredited),
         };
     }
     if (claim.isAffiliate) {
         return {
-            type: types_2.ClaimType.Affiliate,
+            type: types_1.ClaimType.Affiliate,
             scope: meshScopeToScope(claim.asAffiliate),
         };
     }
     if (claim.isBuyLockup) {
         return {
-            type: types_2.ClaimType.BuyLockup,
+            type: types_1.ClaimType.BuyLockup,
             scope: meshScopeToScope(claim.asBuyLockup),
         };
     }
     if (claim.isSellLockup) {
         return {
-            type: types_2.ClaimType.SellLockup,
+            type: types_1.ClaimType.SellLockup,
             scope: meshScopeToScope(claim.asSellLockup),
         };
     }
     if (claim.isCustomerDueDiligence) {
         return {
-            type: types_2.ClaimType.CustomerDueDiligence,
+            type: types_1.ClaimType.CustomerDueDiligence,
             id: cddIdToString(claim.asCustomerDueDiligence),
         };
     }
     if (claim.isKnowYourCustomer) {
         return {
-            type: types_2.ClaimType.KnowYourCustomer,
+            type: types_1.ClaimType.KnowYourCustomer,
             scope: meshScopeToScope(claim.asKnowYourCustomer),
         };
     }
     if (claim.isExempted) {
         return {
-            type: types_2.ClaimType.Exempted,
+            type: types_1.ClaimType.Exempted,
             scope: meshScopeToScope(claim.asExempted),
         };
     }
     return {
-        type: types_2.ClaimType.Blocked,
+        type: types_1.ClaimType.Blocked,
         scope: meshScopeToScope(claim.asBlocked),
     };
 }
@@ -1794,14 +1785,14 @@ exports.meshClaimToClaim = meshClaimToClaim;
 function statsClaimToStatClaimInputType(claim) {
     if (claim.isJurisdiction) {
         return {
-            type: types_2.ClaimType.Jurisdiction,
+            type: types_1.ClaimType.Jurisdiction,
         };
     }
     else if (claim.isAccredited) {
-        return { type: types_2.ClaimType.Accredited };
+        return { type: types_1.ClaimType.Accredited };
     }
     else {
-        return { type: types_2.ClaimType.Affiliate };
+        return { type: types_1.ClaimType.Affiliate };
     }
 }
 exports.statsClaimToStatClaimInputType = statsClaimToStatClaimInputType;
@@ -1819,30 +1810,30 @@ exports.stringToTargetIdentity = stringToTargetIdentity;
  */
 function meshClaimTypeToClaimType(claimType) {
     if (claimType.isJurisdiction) {
-        return types_2.ClaimType.Jurisdiction;
+        return types_1.ClaimType.Jurisdiction;
     }
     if (claimType.isAccredited) {
-        return types_2.ClaimType.Accredited;
+        return types_1.ClaimType.Accredited;
     }
     if (claimType.isAffiliate) {
-        return types_2.ClaimType.Affiliate;
+        return types_1.ClaimType.Affiliate;
     }
     if (claimType.isBuyLockup) {
-        return types_2.ClaimType.BuyLockup;
+        return types_1.ClaimType.BuyLockup;
     }
     if (claimType.isSellLockup) {
-        return types_2.ClaimType.SellLockup;
+        return types_1.ClaimType.SellLockup;
     }
     if (claimType.isCustomerDueDiligence) {
-        return types_2.ClaimType.CustomerDueDiligence;
+        return types_1.ClaimType.CustomerDueDiligence;
     }
     if (claimType.isKnowYourCustomer) {
-        return types_2.ClaimType.KnowYourCustomer;
+        return types_1.ClaimType.KnowYourCustomer;
     }
     if (claimType.isExempted) {
-        return types_2.ClaimType.Exempted;
+        return types_1.ClaimType.Exempted;
     }
-    return types_2.ClaimType.Blocked;
+    return types_1.ClaimType.Blocked;
 }
 exports.meshClaimTypeToClaimType = meshClaimTypeToClaimType;
 /**
@@ -1903,7 +1894,7 @@ function requirementToComplianceRequirement(requirement, context) {
         }
         else {
             // IsExternalAgent does not exist as a condition type in Polymesh, it's SDK sugar
-            type = types_2.ConditionType.IsIdentity;
+            type = types_1.ConditionType.IsIdentity;
             conditionContent = stringToTargetIdentity(null, context);
         }
         const { target, trustedClaimIssuers = [] } = condition;
@@ -1913,10 +1904,10 @@ function requirementToComplianceRequirement(requirement, context) {
             },
             issuers: trustedClaimIssuers.map(issuer => trustedClaimIssuerToTrustedIssuer(issuer, context)),
         });
-        if ([types_2.ConditionTarget.Both, types_2.ConditionTarget.Receiver].includes(target)) {
+        if ([types_1.ConditionTarget.Both, types_1.ConditionTarget.Receiver].includes(target)) {
             receiverConditions.push(meshCondition);
         }
-        if ([types_2.ConditionTarget.Both, types_2.ConditionTarget.Sender].includes(target)) {
+        if ([types_1.ConditionTarget.Both, types_1.ConditionTarget.Sender].includes(target)) {
             senderConditions.push(meshCondition);
         }
     });
@@ -1933,19 +1924,19 @@ exports.requirementToComplianceRequirement = requirementToComplianceRequirement;
 function meshConditionTypeToCondition(meshConditionType, context) {
     if (meshConditionType.isIsPresent) {
         return {
-            type: types_2.ConditionType.IsPresent,
+            type: types_1.ConditionType.IsPresent,
             claim: meshClaimToClaim(meshConditionType.asIsPresent),
         };
     }
     if (meshConditionType.isIsAbsent) {
         return {
-            type: types_2.ConditionType.IsAbsent,
+            type: types_1.ConditionType.IsAbsent,
             claim: meshClaimToClaim(meshConditionType.asIsAbsent),
         };
     }
     if (meshConditionType.isIsAnyOf) {
         return {
-            type: types_2.ConditionType.IsAnyOf,
+            type: types_1.ConditionType.IsAnyOf,
             claims: meshConditionType.asIsAnyOf.map(claim => meshClaimToClaim(claim)),
         };
     }
@@ -1953,16 +1944,16 @@ function meshConditionTypeToCondition(meshConditionType, context) {
         const target = meshConditionType.asIsIdentity;
         if (target.isExternalAgent) {
             return {
-                type: types_2.ConditionType.IsExternalAgent,
+                type: types_1.ConditionType.IsExternalAgent,
             };
         }
         return {
-            type: types_2.ConditionType.IsIdentity,
+            type: types_1.ConditionType.IsIdentity,
             identity: new internal_1.Identity({ did: identityIdToString(target.asSpecific) }, context),
         };
     }
     return {
-        type: types_2.ConditionType.IsNoneOf,
+        type: types_1.ConditionType.IsNoneOf,
         claims: meshConditionType.asIsNoneOf.map(claim => meshClaimToClaim(claim)),
     };
 }
@@ -1975,7 +1966,7 @@ function complianceRequirementResultToRequirementCompliance(complianceRequiremen
     const conditionCompliancesAreEqual = ({ condition: aCondition, complies: aComplies }, { condition: bCondition, complies: bComplies }) => (0, internal_3.conditionsAreEqual)(aCondition, bCondition) && aComplies === bComplies;
     complianceRequirement.senderConditions.forEach(({ condition: { conditionType, issuers }, result }) => {
         const newCondition = {
-            condition: Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_2.ConditionTarget.Sender, trustedClaimIssuers: issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context)) }),
+            condition: Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_1.ConditionTarget.Sender, trustedClaimIssuers: issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context)) }),
             complies: boolToBoolean(result),
         };
         const existingCondition = conditions.find(condition => conditionCompliancesAreEqual(condition, newCondition));
@@ -1985,12 +1976,12 @@ function complianceRequirementResultToRequirementCompliance(complianceRequiremen
     });
     complianceRequirement.receiverConditions.forEach(({ condition: { conditionType, issuers }, result }) => {
         const newCondition = {
-            condition: Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_2.ConditionTarget.Receiver, trustedClaimIssuers: issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context)) }),
+            condition: Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_1.ConditionTarget.Receiver, trustedClaimIssuers: issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context)) }),
             complies: boolToBoolean(result),
         };
         const existingCondition = conditions.find(condition => conditionCompliancesAreEqual(condition, newCondition));
-        if (existingCondition && existingCondition.condition.target === types_2.ConditionTarget.Sender) {
-            existingCondition.condition.target = types_2.ConditionTarget.Both;
+        if (existingCondition && existingCondition.condition.target === types_1.ConditionTarget.Sender) {
+            existingCondition.condition.target = types_1.ConditionTarget.Both;
         }
         else {
             conditions.push(newCondition);
@@ -2009,7 +2000,7 @@ exports.complianceRequirementResultToRequirementCompliance = complianceRequireme
 function complianceRequirementToRequirement(complianceRequirement, context) {
     const conditions = [];
     complianceRequirement.senderConditions.forEach(({ conditionType, issuers }) => {
-        const newCondition = Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_2.ConditionTarget.Sender });
+        const newCondition = Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_1.ConditionTarget.Sender });
         if (issuers.length) {
             newCondition.trustedClaimIssuers = issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context));
         }
@@ -2019,13 +2010,13 @@ function complianceRequirementToRequirement(complianceRequirement, context) {
         }
     });
     complianceRequirement.receiverConditions.forEach(({ conditionType, issuers }) => {
-        const newCondition = Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_2.ConditionTarget.Receiver });
+        const newCondition = Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_1.ConditionTarget.Receiver });
         if (issuers.length) {
             newCondition.trustedClaimIssuers = issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context));
         }
         const existingCondition = conditions.find(condition => (0, internal_3.conditionsAreEqual)(condition, newCondition));
-        if (existingCondition && existingCondition.target === types_2.ConditionTarget.Sender) {
-            existingCondition.target = types_2.ConditionTarget.Both;
+        if (existingCondition && existingCondition.target === types_1.ConditionTarget.Sender) {
+            existingCondition.target = types_1.ConditionTarget.Both;
         }
         else {
             conditions.push(newCondition);
@@ -2042,49 +2033,38 @@ exports.complianceRequirementToRequirement = complianceRequirementToRequirement;
  */
 function txTagToProtocolOp(tag, context) {
     const protocolOpTags = [
-        types_2.TxTags.asset.RegisterTicker,
-        types_2.TxTags.asset.Issue,
-        types_2.TxTags.asset.AddDocuments,
-        types_2.TxTags.asset.CreateAsset,
-        types_2.TxTags.capitalDistribution.Distribute,
-        types_2.TxTags.checkpoint.CreateSchedule,
-        types_2.TxTags.complianceManager.AddComplianceRequirement,
-        types_2.TxTags.identity.CddRegisterDid,
-        types_2.TxTags.identity.AddClaim,
-        types_2.TxTags.identity.AddSecondaryKeysWithAuthorization,
-        types_2.TxTags.pips.Propose,
-        types_2.TxTags.corporateBallot.AttachBallot,
-        types_2.TxTags.capitalDistribution.Distribute,
+        types_1.TxTags.asset.RegisterTicker,
+        types_1.TxTags.asset.Issue,
+        types_1.TxTags.asset.AddDocuments,
+        types_1.TxTags.asset.CreateAsset,
+        types_1.TxTags.capitalDistribution.Distribute,
+        types_1.TxTags.checkpoint.CreateSchedule,
+        types_1.TxTags.complianceManager.AddComplianceRequirement,
+        types_1.TxTags.identity.CddRegisterDid,
+        types_1.TxTags.identity.AddClaim,
+        types_1.TxTags.identity.AddSecondaryKeysWithAuthorization,
+        types_1.TxTags.pips.Propose,
+        types_1.TxTags.corporateBallot.AttachBallot,
+        types_1.TxTags.capitalDistribution.Distribute,
     ];
     const [moduleName, extrinsicName] = tag.split('.');
     const value = `${(0, util_1.stringUpperFirst)(moduleName)}${(0, util_1.stringUpperFirst)(extrinsicName)}`;
     if (!(0, lodash_1.includes)(protocolOpTags, tag)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: `${value} does not match any PolymeshCommonUtilitiesProtocolFeeProtocolOp`,
         });
     }
     return context.createType('PolymeshCommonUtilitiesProtocolFeeProtocolOp', value);
 }
 exports.txTagToProtocolOp = txTagToProtocolOp;
-/**
- * @hidden
- */
-function txTagToExtrinsicIdentifier(tag) {
-    const [moduleName, extrinsicName] = tag.split('.');
-    return {
-        moduleId: moduleName.toLowerCase(),
-        callId: (0, lodash_1.snakeCase)(extrinsicName),
-    };
-}
-exports.txTagToExtrinsicIdentifier = txTagToExtrinsicIdentifier;
 /**
  * @hidden
  */
 function extrinsicIdentifierToTxTag(extrinsicIdentifier) {
     const { moduleId, callId } = extrinsicIdentifier;
     let moduleName;
-    for (const txTagItem in types_2.TxTags) {
+    for (const txTagItem in types_1.TxTags) {
         if (txTagItem.toLowerCase() === moduleId) {
             moduleName = txTagItem;
         }
@@ -2095,14 +2075,14 @@ exports.extrinsicIdentifierToTxTag = extrinsicIdentifierToTxTag;
 /**
  * @hidden
  */
-function txTagToExtrinsicIdentifierV2(tag) {
+function txTagToExtrinsicIdentifier(tag) {
     const [moduleName, extrinsicName] = tag.split('.');
     return {
         moduleId: moduleName.toLowerCase(),
         callId: (0, lodash_1.snakeCase)(extrinsicName),
     };
 }
-exports.txTagToExtrinsicIdentifierV2 = txTagToExtrinsicIdentifierV2;
+exports.txTagToExtrinsicIdentifier = txTagToExtrinsicIdentifier;
 /**
  * @hidden
  */
@@ -2183,15 +2163,15 @@ exports.secondaryAccountToMeshSecondaryKey = secondaryAccountToMeshSecondaryKey;
  */
 function meshVenueTypeToVenueType(type) {
     if (type.isOther) {
-        return types_2.VenueType.Other;
+        return types_1.VenueType.Other;
     }
     if (type.isDistribution) {
-        return types_2.VenueType.Distribution;
+        return types_1.VenueType.Distribution;
     }
     if (type.isSto) {
-        return types_2.VenueType.Sto;
+        return types_1.VenueType.Sto;
     }
-    return types_2.VenueType.Exchange;
+    return types_1.VenueType.Exchange;
 }
 exports.meshVenueTypeToVenueType = meshVenueTypeToVenueType;
 /**
@@ -2230,12 +2210,12 @@ exports.meshInstructionStatusToInstructionStatus = meshInstructionStatusToInstru
  */
 function meshAffirmationStatusToAffirmationStatus(status) {
     if (status.isUnknown) {
-        return types_2.AffirmationStatus.Unknown;
+        return types_1.AffirmationStatus.Unknown;
     }
     if (status.isPending) {
-        return types_2.AffirmationStatus.Pending;
+        return types_1.AffirmationStatus.Pending;
     }
-    return types_2.AffirmationStatus.Affirmed;
+    return types_1.AffirmationStatus.Affirmed;
 }
 exports.meshAffirmationStatusToAffirmationStatus = meshAffirmationStatusToAffirmationStatus;
 /**
@@ -2243,15 +2223,15 @@ exports.meshAffirmationStatusToAffirmationStatus = meshAffirmationStatusToAffirm
  */
 function meshSettlementTypeToEndCondition(type) {
     if (type.isSettleOnBlock) {
-        return { type: types_2.InstructionType.SettleOnBlock, endBlock: u32ToBigNumber(type.asSettleOnBlock) };
+        return { type: types_1.InstructionType.SettleOnBlock, endBlock: u32ToBigNumber(type.asSettleOnBlock) };
     }
     if (type.isSettleManual) {
         return {
-            type: types_2.InstructionType.SettleManual,
+            type: types_1.InstructionType.SettleManual,
             endAfterBlock: u32ToBigNumber(type.asSettleManual),
         };
     }
-    return { type: types_2.InstructionType.SettleOnAffirmation };
+    return { type: types_1.InstructionType.SettleOnAffirmation };
 }
 exports.meshSettlementTypeToEndCondition = meshSettlementTypeToEndCondition;
 /**
@@ -2261,16 +2241,16 @@ function endConditionToSettlementType(endCondition, context) {
     let value;
     const { type } = endCondition;
     switch (type) {
-        case types_2.InstructionType.SettleOnBlock:
-            value = { [types_2.InstructionType.SettleOnBlock]: bigNumberToU32(endCondition.endBlock, context) };
+        case types_1.InstructionType.SettleOnBlock:
+            value = { [types_1.InstructionType.SettleOnBlock]: bigNumberToU32(endCondition.endBlock, context) };
             break;
-        case types_2.InstructionType.SettleManual:
+        case types_1.InstructionType.SettleManual:
             value = {
-                [types_2.InstructionType.SettleManual]: bigNumberToU32(endCondition.endAfterBlock, context),
+                [types_1.InstructionType.SettleManual]: bigNumberToU32(endCondition.endAfterBlock, context),
             };
             break;
         default:
-            value = types_2.InstructionType.SettleOnAffirmation;
+            value = types_1.InstructionType.SettleOnAffirmation;
     }
     if (context.isV5) {
         return context.createType('PalletSettlementSettlementType', value);
@@ -2283,24 +2263,7 @@ exports.endConditionToSettlementType = endConditionToSettlementType;
 /**
  * @hidden
  */
-function toIdentityWithClaimsArray(data, context) {
-    return data.map(({ did, claims }) => ({
-        identity: new internal_1.Identity({ did }, context),
-        claims: claims.map(({ targetDID: targetDid, issuer, issuance_date: issuanceDate, last_update_date: lastUpdateDate, expiry, type, jurisdiction, scope: claimScope, cdd_id: cddId, }) => ({
-            target: new internal_1.Identity({ did: targetDid }, context),
-            issuer: new internal_1.Identity({ did: issuer }, context),
-            issuedAt: new Date(issuanceDate),
-            lastUpdatedAt: new Date(lastUpdateDate),
-            expiry: expiry ? new Date(expiry) : null,
-            claim: (0, internal_3.createClaim)(type, jurisdiction, claimScope, cddId),
-        })),
-    }));
-}
-exports.toIdentityWithClaimsArray = toIdentityWithClaimsArray;
-/**
- * @hidden
- */
-function middlewareV2ClaimToClaimData(claim, context) {
+function middlewareClaimToClaimData(claim, context) {
     const { targetId, issuerId, issuanceDate, lastUpdateDate, expiry, type, jurisdiction, scope, cddId, } = claim;
     return {
         target: new internal_1.Identity({ did: targetId }, context),
@@ -2311,18 +2274,18 @@ function middlewareV2ClaimToClaimData(claim, context) {
         claim: (0, internal_3.createClaim)(type, jurisdiction, scope, cddId),
     };
 }
-exports.middlewareV2ClaimToClaimData = middlewareV2ClaimToClaimData;
+exports.middlewareClaimToClaimData = middlewareClaimToClaimData;
 /**
  * @hidden
  */
-function toIdentityWithClaimsArrayV2(data, context, groupByAttribute) {
+function toIdentityWithClaimsArray(data, context, groupByAttribute) {
     const groupedData = (0, lodash_1.groupBy)(data, groupByAttribute);
     return (0, lodash_1.map)(groupedData, (claims, did) => ({
         identity: new internal_1.Identity({ did }, context),
-        claims: claims.map(claim => middlewareV2ClaimToClaimData(claim, context)),
+        claims: claims.map(claim => middlewareClaimToClaimData(claim, context)),
     }));
 }
-exports.toIdentityWithClaimsArrayV2 = toIdentityWithClaimsArrayV2;
+exports.toIdentityWithClaimsArray = toIdentityWithClaimsArray;
 /**
  * @hidden
  */
@@ -2370,30 +2333,30 @@ function transferRestrictionToPolymeshTransferCondition(restriction, context) {
     let restrictionType;
     let restrictionValue;
     const extractClaimValue = (claim) => {
-        if (claim.type === types_2.ClaimType.Accredited) {
+        if (claim.type === types_1.ClaimType.Accredited) {
             return booleanToBool(claim.accredited, context);
         }
-        else if (claim.type === types_2.ClaimType.Affiliate) {
+        else if (claim.type === types_1.ClaimType.Affiliate) {
             return booleanToBool(claim.affiliate, context);
         }
         else {
             return (0, internal_3.optionize)(utils_2.countryCodeToMeshCountryCode)(claim.countryCode, context);
         }
     };
-    if (type === types_2.TransferRestrictionType.Count) {
+    if (type === types_1.TransferRestrictionType.Count) {
         restrictionType = 'MaxInvestorCount';
         restrictionValue = bigNumberToU64(value, context);
     }
-    else if (type === types_2.TransferRestrictionType.Percentage) {
+    else if (type === types_1.TransferRestrictionType.Percentage) {
         restrictionType = 'MaxInvestorOwnership';
         restrictionValue = percentageToPermill(value, context);
     }
-    else if (type === types_2.TransferRestrictionType.ClaimCount ||
-        type === types_2.TransferRestrictionType.ClaimPercentage) {
+    else if (type === types_1.TransferRestrictionType.ClaimCount ||
+        type === types_1.TransferRestrictionType.ClaimPercentage) {
         let rawMin;
         let rawMax;
         const { min, max, claim, issuer } = value;
-        if (type === types_2.TransferRestrictionType.ClaimCount) {
+        if (type === types_1.TransferRestrictionType.ClaimCount) {
             restrictionType = 'ClaimCount';
             rawMin = bigNumberToU64(min, context);
             rawMax = (0, internal_3.optionize)(bigNumberToU64)(max, context);
@@ -2413,7 +2376,7 @@ function transferRestrictionToPolymeshTransferCondition(restriction, context) {
     }
     else {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.UnexpectedError,
+            code: types_1.ErrorCode.UnexpectedError,
             message: `Unexpected transfer restriction type: "${type}". Please report this to the Polymesh team`,
         });
     }
@@ -2436,31 +2399,31 @@ exports.identitiesToBtreeSet = identitiesToBtreeSet;
 function transferConditionToTransferRestriction(transferCondition, context) {
     if (transferCondition.isMaxInvestorCount) {
         return {
-            type: types_2.TransferRestrictionType.Count,
+            type: types_1.TransferRestrictionType.Count,
             value: u64ToBigNumber(transferCondition.asMaxInvestorCount),
         };
     }
     else if (transferCondition.isMaxInvestorOwnership) {
         return {
-            type: types_2.TransferRestrictionType.Percentage,
+            type: types_1.TransferRestrictionType.Percentage,
             value: permillToBigNumber(transferCondition.asMaxInvestorOwnership),
         };
     }
     else if (transferCondition.isClaimCount) {
         return {
-            type: types_2.TransferRestrictionType.ClaimCount,
+            type: types_1.TransferRestrictionType.ClaimCount,
             value: claimCountToClaimCountRestrictionValue(transferCondition.asClaimCount, context),
         };
     }
     else if (transferCondition.isClaimOwnership) {
         return {
-            type: types_2.TransferRestrictionType.ClaimPercentage,
+            type: types_1.TransferRestrictionType.ClaimPercentage,
             value: claimPercentageToClaimPercentageRestrictionValue(transferCondition.asClaimOwnership, context),
         };
     }
     else {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.FatalError,
+            code: types_1.ErrorCode.FatalError,
             message: 'Unexpected transfer condition type',
         });
     }
@@ -2473,34 +2436,34 @@ function granularCanTransferResultToTransferBreakdown(result, context) {
     const { invalid_granularity: invalidGranularity, self_transfer: selfTransfer, invalid_receiver_cdd: invalidReceiverCdd, invalid_sender_cdd: invalidSenderCdd, missing_scope_claim: missingScopeClaim, sender_insufficient_balance: insufficientBalance, asset_frozen: assetFrozen, portfolio_validity_result: { sender_portfolio_does_not_exist: senderPortfolioNotExists, receiver_portfolio_does_not_exist: receiverPortfolioNotExists, sender_insufficient_balance: senderInsufficientBalance, }, transfer_condition_result: transferConditionResult, compliance_result: complianceResult, result: finalResult, } = result;
     const general = [];
     if (boolToBoolean(invalidGranularity)) {
-        general.push(types_2.TransferError.InvalidGranularity);
+        general.push(types_1.TransferError.InvalidGranularity);
     }
     if (boolToBoolean(selfTransfer)) {
-        general.push(types_2.TransferError.SelfTransfer);
+        general.push(types_1.TransferError.SelfTransfer);
     }
     if (boolToBoolean(invalidReceiverCdd)) {
-        general.push(types_2.TransferError.InvalidReceiverCdd);
+        general.push(types_1.TransferError.InvalidReceiverCdd);
     }
     if (boolToBoolean(invalidSenderCdd)) {
-        general.push(types_2.TransferError.InvalidSenderCdd);
+        general.push(types_1.TransferError.InvalidSenderCdd);
     }
     if (boolToBoolean(missingScopeClaim)) {
-        general.push(types_2.TransferError.ScopeClaimMissing);
+        general.push(types_1.TransferError.ScopeClaimMissing);
     }
     if (boolToBoolean(insufficientBalance)) {
-        general.push(types_2.TransferError.InsufficientBalance);
+        general.push(types_1.TransferError.InsufficientBalance);
     }
     if (boolToBoolean(assetFrozen)) {
-        general.push(types_2.TransferError.TransfersFrozen);
+        general.push(types_1.TransferError.TransfersFrozen);
     }
     if (boolToBoolean(senderPortfolioNotExists)) {
-        general.push(types_2.TransferError.InvalidSenderPortfolio);
+        general.push(types_1.TransferError.InvalidSenderPortfolio);
     }
     if (boolToBoolean(receiverPortfolioNotExists)) {
-        general.push(types_2.TransferError.InvalidReceiverPortfolio);
+        general.push(types_1.TransferError.InvalidReceiverPortfolio);
     }
     if (boolToBoolean(senderInsufficientBalance)) {
-        general.push(types_2.TransferError.InsufficientPortfolioBalance);
+        general.push(types_1.TransferError.InsufficientPortfolioBalance);
     }
     const restrictions = transferConditionResult.map(({ condition, result: tmResult }) => {
         return {
@@ -2533,16 +2496,16 @@ exports.offeringTierToPriceTier = offeringTierToPriceTier;
 function permissionsLikeToPermissions(permissionsLike, context) {
     let assetPermissions = {
         values: [],
-        type: types_2.PermissionType.Include,
+        type: types_1.PermissionType.Include,
     };
     let transactionPermissions = {
         values: [],
-        type: types_2.PermissionType.Include,
+        type: types_1.PermissionType.Include,
     };
     let transactionGroupPermissions = [];
     let portfolioPermissions = {
         values: [],
-        type: types_2.PermissionType.Include,
+        type: types_1.PermissionType.Include,
     };
     let transactions;
     let transactionGroups;
@@ -2585,24 +2548,13 @@ exports.permissionsLikeToPermissions = permissionsLikeToPermissions;
  * @hidden
  */
 function middlewarePortfolioToPortfolio(portfolio, context) {
-    const { did, kind } = portfolio;
-    if (kind.toLowerCase() === 'default' || kind === '0') {
-        return new internal_1.DefaultPortfolio({ did }, context);
-    }
-    return new internal_1.NumberedPortfolio({ did, id: new bignumber_js_1.default(kind) }, context);
-}
-exports.middlewarePortfolioToPortfolio = middlewarePortfolioToPortfolio;
-/**
- * @hidden
- */
-function middlewareV2PortfolioToPortfolio(portfolio, context) {
     const { identityId: did, number } = portfolio;
     if (number) {
         return new internal_1.NumberedPortfolio({ did, id: new bignumber_js_1.default(number) }, context);
     }
     return new internal_1.DefaultPortfolio({ did }, context);
 }
-exports.middlewareV2PortfolioToPortfolio = middlewareV2PortfolioToPortfolio;
+exports.middlewarePortfolioToPortfolio = middlewarePortfolioToPortfolio;
 /**
  * @hidden
  */
@@ -2638,29 +2590,29 @@ function fundraiserToOfferingDetails(fundraiser, name, context) {
     const isStarted = now > start;
     const isExpired = end && now > end;
     const minInvestment = balanceToBigNumber(rawMinInvestment);
-    let timing = types_2.OfferingTimingStatus.NotStarted;
-    let balance = types_2.OfferingBalanceStatus.Available;
-    let sale = types_2.OfferingSaleStatus.Live;
+    let timing = types_1.OfferingTimingStatus.NotStarted;
+    let balance = types_1.OfferingBalanceStatus.Available;
+    let sale = types_1.OfferingSaleStatus.Live;
     if (isExpired) {
-        timing = types_2.OfferingTimingStatus.Expired;
+        timing = types_1.OfferingTimingStatus.Expired;
     }
     else if (isStarted) {
-        timing = types_2.OfferingTimingStatus.Started;
+        timing = types_1.OfferingTimingStatus.Started;
     }
     if (totalRemainingValue.isZero()) {
-        balance = types_2.OfferingBalanceStatus.SoldOut;
+        balance = types_1.OfferingBalanceStatus.SoldOut;
     }
     else if (totalRemainingValue.lt(minInvestment)) {
-        balance = types_2.OfferingBalanceStatus.Residual;
+        balance = types_1.OfferingBalanceStatus.Residual;
     }
     if (rawStatus.isClosedEarly) {
-        sale = types_2.OfferingSaleStatus.ClosedEarly;
+        sale = types_1.OfferingSaleStatus.ClosedEarly;
     }
     else if (rawStatus.isClosed) {
-        sale = types_2.OfferingSaleStatus.Closed;
+        sale = types_1.OfferingSaleStatus.Closed;
     }
     else if (rawStatus.isFrozen) {
-        sale = types_2.OfferingSaleStatus.Frozen;
+        sale = types_1.OfferingSaleStatus.Frozen;
     }
     return {
         creator: new internal_1.Identity({ did: identityIdToString(creator) }, context),
@@ -2690,23 +2642,23 @@ function meshCorporateActionToCorporateActionParams(corporateAction, details, co
     const { kind: rawKind, declDate, targets: { identities, treatment }, defaultWithholdingTax, withholdingTax, } = corporateAction;
     let kind;
     if (rawKind.isIssuerNotice) {
-        kind = types_2.CorporateActionKind.IssuerNotice;
+        kind = types_1.CorporateActionKind.IssuerNotice;
     }
     else if (rawKind.isPredictableBenefit) {
-        kind = types_2.CorporateActionKind.PredictableBenefit;
+        kind = types_1.CorporateActionKind.PredictableBenefit;
     }
     else if (rawKind.isUnpredictableBenefit) {
-        kind = types_2.CorporateActionKind.UnpredictableBenefit;
+        kind = types_1.CorporateActionKind.UnpredictableBenefit;
     }
     else if (rawKind.isReorganization) {
-        kind = types_2.CorporateActionKind.Reorganization;
+        kind = types_1.CorporateActionKind.Reorganization;
     }
     else {
-        kind = types_2.CorporateActionKind.Other;
+        kind = types_1.CorporateActionKind.Other;
     }
     const targets = {
         identities: identities.map(identityId => new internal_1.Identity({ did: identityIdToString(identityId) }, context)),
-        treatment: treatment.isExclude ? types_2.TargetTreatment.Exclude : types_2.TargetTreatment.Include,
+        treatment: treatment.isExclude ? types_1.TargetTreatment.Exclude : types_1.TargetTreatment.Include,
     };
     const taxWithholdings = withholdingTax.map(([identityId, tax]) => ({
         identity: new internal_1.Identity({ did: identityIdToString(identityId) }, context),
@@ -2755,7 +2707,7 @@ function targetIdentitiesToCorporateActionTargets(targetIdentities, context) {
     const { identities, treatment } = targetIdentities;
     return {
         identities: identities.map(identity => new internal_1.Identity({ did: identityIdToString(identity) }, context)),
-        treatment: treatment.isInclude ? types_2.TargetTreatment.Include : types_2.TargetTreatment.Exclude,
+        treatment: treatment.isInclude ? types_1.TargetTreatment.Include : types_1.TargetTreatment.Exclude,
     };
 }
 exports.targetIdentitiesToCorporateActionTargets = targetIdentitiesToCorporateActionTargets;
@@ -2768,7 +2720,7 @@ function targetsToTargetIdentities(targets, context) {
     const maxTargets = u32ToBigNumber(maxTargetIds);
     if (maxTargets.lt(targets.identities.length)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Too many target Identities',
             data: {
                 maxTargets,
@@ -2908,17 +2860,17 @@ function meshStatToStatType(rawStat) {
     const { op: { type }, claimIssuer, } = rawStat;
     if (claimIssuer.isNone) {
         if (type === 'Count') {
-            return types_2.StatType.Count;
+            return types_1.StatType.Count;
         }
         else {
-            return types_2.StatType.Balance;
+            return types_1.StatType.Balance;
         }
     }
     if (type === 'Count') {
-        return types_2.StatType.ScopedCount;
+        return types_1.StatType.ScopedCount;
     }
     else {
-        return types_2.StatType.ScopedBalance;
+        return types_1.StatType.ScopedBalance;
     }
 }
 exports.meshStatToStatType = meshStatToStatType;
@@ -2926,20 +2878,20 @@ exports.meshStatToStatType = meshStatToStatType;
  * @hidden
  */
 function statTypeToStatOpType(type, context) {
-    if (type === types_2.StatType.Count || type === types_2.StatType.ScopedCount) {
-        return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_2.StatType.Count);
+    if (type === types_1.StatType.Count || type === types_1.StatType.ScopedCount) {
+        return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_1.StatType.Count);
     }
-    return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_2.StatType.Balance);
+    return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_1.StatType.Balance);
 }
 exports.statTypeToStatOpType = statTypeToStatOpType;
 /**
  * @hidden
  */
 function transferRestrictionTypeToStatOpType(type, context) {
-    if (type === types_2.TransferRestrictionType.Count || type === types_2.TransferRestrictionType.ClaimCount) {
-        return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_2.StatType.Count);
+    if (type === types_1.TransferRestrictionType.Count || type === types_1.TransferRestrictionType.ClaimCount) {
+        return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_1.StatType.Count);
     }
-    return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_2.StatType.Balance);
+    return context.createType('PolymeshPrimitivesStatisticsStatOpType', types_1.StatType.Balance);
 }
 exports.transferRestrictionTypeToStatOpType = transferRestrictionTypeToStatOpType;
 /**
@@ -3014,7 +2966,7 @@ function sortTransferRestrictionByClaimValue(conditions) {
         }
         const aCode = (0, utils_2.meshCountryCodeToCountryCode)(aClaim.unwrap());
         const bCode = (0, utils_2.meshCountryCodeToCountryCode)(bClaim.unwrap());
-        const countryOrder = Object.values(types_2.CountryCode);
+        const countryOrder = Object.values(types_1.CountryCode);
         return countryOrder.indexOf(aCode) - countryOrder.indexOf(bCode);
     });
 }
@@ -3040,7 +2992,7 @@ exports.toExemptKey = toExemptKey;
 function claimCountStatInputToStatUpdates(args, context) {
     const { value, claimType: type } = args;
     let updateArgs;
-    if (type === types_2.ClaimType.Jurisdiction) {
+    if (type === types_1.ClaimType.Jurisdiction) {
         updateArgs = value.map(({ countryCode, count }) => {
             const rawSecondKey = createStat2ndKey(type, context, countryCode);
             return keyAndValueToStatUpdate(rawSecondKey, bigNumberToU128(count, context), context);
@@ -3048,7 +3000,7 @@ function claimCountStatInputToStatUpdates(args, context) {
     }
     else {
         let yes, no;
-        if (type === types_2.ClaimType.Accredited) {
+        if (type === types_1.ClaimType.Accredited) {
             ({ accredited: yes, nonAccredited: no } = value);
         }
         else {
@@ -3084,7 +3036,7 @@ function inputStatTypeToMeshStatType(input, context) {
     const { type } = input;
     const op = statTypeToStatOpType(type, context);
     let claimIssuer;
-    if (type === types_2.StatType.ScopedCount || type === types_2.StatType.ScopedBalance) {
+    if (type === types_1.StatType.ScopedCount || type === types_1.StatType.ScopedBalance) {
         claimIssuer = claimIssuerToMeshClaimIssuer(input.claimIssuer, context);
     }
     return statisticsOpTypeToStatType({ op, claimIssuer }, context);
@@ -3098,19 +3050,19 @@ function meshProposalStatusToProposalStatus(status, expiry) {
     switch (type) {
         case 'ActiveOrExpired':
             if (!expiry || expiry > new Date()) {
-                return types_2.ProposalStatus.Active;
+                return types_1.ProposalStatus.Active;
             }
             else {
-                return types_2.ProposalStatus.Expired;
+                return types_1.ProposalStatus.Expired;
             }
         case 'Invalid':
-            return types_2.ProposalStatus.Invalid;
+            return types_1.ProposalStatus.Invalid;
         case 'ExecutionSuccessful':
-            return types_2.ProposalStatus.Successful;
+            return types_1.ProposalStatus.Successful;
         case 'ExecutionFailed':
-            return types_2.ProposalStatus.Failed;
+            return types_1.ProposalStatus.Failed;
         case 'Rejected':
-            return types_2.ProposalStatus.Rejected;
+            return types_1.ProposalStatus.Rejected;
         default:
             throw new utils_1.UnreachableCaseError(type);
     }
@@ -3125,7 +3077,7 @@ function metadataSpecToMeshMetadataSpec(specs, context) {
     const metadataTypeDefMaxLength = u32ToBigNumber(assetMetadataTypeDefMaxLength);
     if (typeDef && metadataTypeDefMaxLength.lt(typeDef.length)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: '"typeDef" length exceeded for given Asset Metadata spec',
             data: {
                 maxLength: metadataTypeDefMaxLength,
@@ -3165,7 +3117,7 @@ exports.meshMetadataSpecToMetadataSpec = meshMetadataSpecToMetadataSpec;
 function metadataToMeshMetadataKey(type, id, context) {
     const rawId = bigNumberToU64(id, context);
     let metadataKey;
-    if (type === types_2.MetadataType.Local) {
+    if (type === types_1.MetadataType.Local) {
         metadataKey = { Local: rawId };
     }
     else {
@@ -3183,17 +3135,17 @@ function meshMetadataValueToMetadataValue(rawValue, rawDetails) {
     }
     let metadataValue = {
         value: bytesToString(rawValue.unwrap()),
-        lockStatus: types_2.MetadataLockStatus.Unlocked,
+        lockStatus: types_1.MetadataLockStatus.Unlocked,
         expiry: null,
     };
     if (rawDetails.isSome) {
         const { lockStatus: rawLockStatus, expire } = rawDetails.unwrap();
         metadataValue = Object.assign(Object.assign({}, metadataValue), { expiry: (0, internal_3.optionize)(momentToDate)(expire.unwrapOr(null)) });
         if (rawLockStatus.isLocked) {
-            metadataValue = Object.assign(Object.assign({}, metadataValue), { lockStatus: types_2.MetadataLockStatus.Locked });
+            metadataValue = Object.assign(Object.assign({}, metadataValue), { lockStatus: types_1.MetadataLockStatus.Locked });
         }
         if (rawLockStatus.isLockedUntil) {
-            metadataValue = Object.assign(Object.assign({}, metadataValue), { lockStatus: types_2.MetadataLockStatus.LockedUntil, lockedUntil: momentToDate(rawLockStatus.asLockedUntil) });
+            metadataValue = Object.assign(Object.assign({}, metadataValue), { lockStatus: types_1.MetadataLockStatus.LockedUntil, lockedUntil: momentToDate(rawLockStatus.asLockedUntil) });
         }
     }
     return metadataValue;
@@ -3207,7 +3159,7 @@ function metadataValueToMeshMetadataValue(value, context) {
     const metadataValueMaxLength = u32ToBigNumber(assetMetadataValueMaxLength);
     if (metadataValueMaxLength.lt(value.length)) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Asset Metadata value length exceeded',
             data: {
                 maxLength: metadataValueMaxLength,
@@ -3223,11 +3175,11 @@ exports.metadataValueToMeshMetadataValue = metadataValueToMeshMetadataValue;
 function metadataValueDetailToMeshMetadataValueDetail(details, context) {
     const { lockStatus, expiry } = details;
     let meshLockStatus;
-    if (lockStatus === types_2.MetadataLockStatus.LockedUntil) {
+    if (lockStatus === types_1.MetadataLockStatus.LockedUntil) {
         const { lockedUntil } = details;
         if (lockedUntil < new Date()) {
             throw new internal_1.PolymeshError({
-                code: types_2.ErrorCode.UnmetPrerequisite,
+                code: types_1.ErrorCode.UnmetPrerequisite,
                 message: 'Locked until date must be in the future',
             });
         }
@@ -3238,7 +3190,7 @@ function metadataValueDetailToMeshMetadataValueDetail(details, context) {
     }
     if (expiry && expiry < new Date()) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.UnmetPrerequisite,
+            code: types_1.ErrorCode.UnmetPrerequisite,
             message: 'Expiry date must be in the future',
         });
     }
@@ -3263,9 +3215,9 @@ function middlewareInstructionToHistoricInstruction(instruction, context) {
     const { id: instructionId, status, settlementType, endBlock, tradeDate, valueDate, legs: { nodes: legs }, memo, createdBlock, venueId, } = instruction;
     const { blockId, hash, datetime } = createdBlock;
     let typeDetails;
-    if (settlementType === types_2.InstructionType.SettleOnAffirmation) {
+    if (settlementType === types_1.InstructionType.SettleOnAffirmation) {
         typeDetails = {
-            type: types_2.InstructionType.SettleOnAffirmation,
+            type: types_1.InstructionType.SettleOnAffirmation,
         };
     }
     else {
@@ -3279,8 +3231,8 @@ function middlewareInstructionToHistoricInstruction(instruction, context) {
         valueDate }, typeDetails), { memo: memo !== null && memo !== void 0 ? memo : null, venueId: new bignumber_js_1.default(venueId), createdAt: new Date(datetime), legs: legs.map(({ from, to, assetId, amount }) => ({
             asset: new internal_1.Asset({ ticker: assetId }, context),
             amount: new bignumber_js_1.default(amount).shiftedBy(-6),
-            from: middlewareV2PortfolioToPortfolio(from, context),
-            to: middlewareV2PortfolioToPortfolio(to, context),
+            from: middlewarePortfolioToPortfolio(from, context),
+            to: middlewarePortfolioToPortfolio(to, context),
         })) });
     /* eslint-enable @typescript-eslint/no-non-null-assertion */
 }
@@ -3291,7 +3243,7 @@ exports.middlewareInstructionToHistoricInstruction = middlewareInstructionToHist
 function expiryToMoment(expiry, context) {
     if (expiry && expiry <= new Date()) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.UnmetPrerequisite,
+            code: types_1.ErrorCode.UnmetPrerequisite,
             message: 'Expiry date must be in the future',
         });
     }
@@ -3325,16 +3277,16 @@ function middlewareAgentGroupDataToPermissionGroup(agentGroupData, context) {
     const agentGroup = agentGroupData[asset];
     let permissionGroupIdentifier;
     if ('full' in agentGroup) {
-        permissionGroupIdentifier = types_2.PermissionGroupType.Full;
+        permissionGroupIdentifier = types_1.PermissionGroupType.Full;
     }
     else if ('exceptMeta' in agentGroup) {
-        permissionGroupIdentifier = types_2.PermissionGroupType.ExceptMeta;
+        permissionGroupIdentifier = types_1.PermissionGroupType.ExceptMeta;
     }
     else if ('polymeshV1CAA' in agentGroup) {
-        permissionGroupIdentifier = types_2.PermissionGroupType.PolymeshV1Caa;
+        permissionGroupIdentifier = types_1.PermissionGroupType.PolymeshV1Caa;
     }
     else if ('polymeshV1PIA' in agentGroup) {
-        permissionGroupIdentifier = types_2.PermissionGroupType.PolymeshV1Pia;
+        permissionGroupIdentifier = types_1.PermissionGroupType.PolymeshV1Pia;
     }
     else {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -3351,11 +3303,11 @@ function middlewareExtrinsicPermissionsDataToTransactionPermissions(permissions)
     let extrinsicType;
     let pallets;
     if ('these' in permissions) {
-        extrinsicType = types_2.PermissionType.Include;
+        extrinsicType = types_1.PermissionType.Include;
         pallets = permissions.these;
     }
     else if ('except' in permissions) {
-        extrinsicType = types_2.PermissionType.Exclude;
+        extrinsicType = types_1.PermissionType.Exclude;
         pallets = permissions.except;
     }
     let txValues = [];
@@ -3411,11 +3363,11 @@ function middlewarePermissionsDataToPermissions(permissionsData, context) {
     let assetsType;
     let assetsPermissions;
     if ('these' in asset) {
-        assetsType = types_2.PermissionType.Include;
+        assetsType = types_1.PermissionType.Include;
         assetsPermissions = asset.these;
     }
     else if ('except' in asset) {
-        assetsType = types_2.PermissionType.Exclude;
+        assetsType = types_1.PermissionType.Exclude;
         assetsPermissions = asset.except;
     }
     if (assetsPermissions) {
@@ -3429,11 +3381,11 @@ function middlewarePermissionsDataToPermissions(permissionsData, context) {
     let portfoliosType;
     let portfolioIds;
     if ('these' in portfolio) {
-        portfoliosType = types_2.PermissionType.Include;
+        portfoliosType = types_1.PermissionType.Include;
         portfolioIds = portfolio.these;
     }
     else if ('except' in portfolio) {
-        portfoliosType = types_2.PermissionType.Exclude;
+        portfoliosType = types_1.PermissionType.Exclude;
         portfolioIds = portfolio.except;
     }
     if (portfolioIds) {
@@ -3457,41 +3409,41 @@ exports.middlewarePermissionsDataToPermissions = middlewarePermissionsDataToPerm
  */
 function middlewareAuthorizationDataToAuthorization(context, type, data) {
     switch (type) {
-        case enumsV2_1.AuthTypeEnum.AttestPrimaryKeyRotation:
+        case enums_1.AuthTypeEnum.AttestPrimaryKeyRotation:
             return {
-                type: types_2.AuthorizationType.AttestPrimaryKeyRotation,
+                type: types_1.AuthorizationType.AttestPrimaryKeyRotation,
                 value: new internal_1.Identity({ did: data }, context),
             };
-        case enumsV2_1.AuthTypeEnum.RotatePrimaryKey: {
+        case enums_1.AuthTypeEnum.RotatePrimaryKey: {
             return {
-                type: types_2.AuthorizationType.RotatePrimaryKey,
+                type: types_1.AuthorizationType.RotatePrimaryKey,
             };
         }
-        case enumsV2_1.AuthTypeEnum.RotatePrimaryKeyToSecondary: {
+        case enums_1.AuthTypeEnum.RotatePrimaryKeyToSecondary: {
             return {
-                type: types_2.AuthorizationType.RotatePrimaryKeyToSecondary,
+                type: types_1.AuthorizationType.RotatePrimaryKeyToSecondary,
                 value: middlewarePermissionsDataToPermissions(data, context),
             };
         }
-        case enumsV2_1.AuthTypeEnum.JoinIdentity: {
+        case enums_1.AuthTypeEnum.JoinIdentity: {
             return {
-                type: types_2.AuthorizationType.JoinIdentity,
+                type: types_1.AuthorizationType.JoinIdentity,
                 value: middlewarePermissionsDataToPermissions(data, context),
             };
         }
-        case enumsV2_1.AuthTypeEnum.AddMultiSigSigner:
+        case enums_1.AuthTypeEnum.AddMultiSigSigner:
             return {
-                type: types_2.AuthorizationType.AddMultiSigSigner,
+                type: types_1.AuthorizationType.AddMultiSigSigner,
                 value: data,
             };
-        case enumsV2_1.AuthTypeEnum.AddRelayerPayingKey: {
+        case enums_1.AuthTypeEnum.AddRelayerPayingKey: {
             // data is received in the format - {"5Ci94GCJC2JBM8U1PCkpHX6HkscWmucN9XwUrjb7o4TDgVns","5DZp1QYH49MKZhCtDupNaAeHp8xtqetuSzgf2p2cUWoxW3iu","1000000000"}
             const [beneficiary, subsidizer, allowance] = data
                 .substring(1, data.length - 1)
                 .replace(/"/g, '')
                 .split(',');
             return {
-                type: types_2.AuthorizationType.AddRelayerPayingKey,
+                type: types_1.AuthorizationType.AddRelayerPayingKey,
                 value: {
                     beneficiary: new internal_1.Account({ address: beneficiary }, context),
                     subsidizer: new internal_1.Account({ address: subsidizer }, context),
@@ -3499,33 +3451,33 @@ function middlewareAuthorizationDataToAuthorization(context, type, data) {
                 },
             };
         }
-        case enumsV2_1.AuthTypeEnum.BecomeAgent: {
+        case enums_1.AuthTypeEnum.BecomeAgent: {
             const becomeAgentData = JSON.parse(data.replace(',', ':'));
             return {
-                type: types_2.AuthorizationType.BecomeAgent,
+                type: types_1.AuthorizationType.BecomeAgent,
                 value: middlewareAgentGroupDataToPermissionGroup(becomeAgentData, context),
             };
         }
-        case enumsV2_1.AuthTypeEnum.TransferTicker:
+        case enums_1.AuthTypeEnum.TransferTicker:
             return {
-                type: types_2.AuthorizationType.TransferTicker,
+                type: types_1.AuthorizationType.TransferTicker,
                 value: (0, exports.coerceHexToString)(data),
             };
-        case enumsV2_1.AuthTypeEnum.TransferAssetOwnership: {
+        case enums_1.AuthTypeEnum.TransferAssetOwnership: {
             return {
-                type: types_2.AuthorizationType.TransferAssetOwnership,
+                type: types_1.AuthorizationType.TransferAssetOwnership,
                 value: (0, exports.coerceHexToString)(data),
             };
         }
-        case enumsV2_1.AuthTypeEnum.PortfolioCustody: {
+        case enums_1.AuthTypeEnum.PortfolioCustody: {
             return {
-                type: types_2.AuthorizationType.PortfolioCustody,
+                type: types_1.AuthorizationType.PortfolioCustody,
                 value: middlewarePortfolioDataToPortfolio(JSON.parse(data), context),
             };
         }
     }
     throw new internal_1.PolymeshError({
-        code: types_2.ErrorCode.UnexpectedError,
+        code: types_1.ErrorCode.UnexpectedError,
         message: 'Unsupported Authorization Type. Please contact the Polymesh team',
         data: {
             auth: data,
@@ -3544,7 +3496,7 @@ function calendarPeriodToMeshCalendarPeriod(period, context) {
     const { unit, amount } = period;
     if (amount.isNegative()) {
         throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
+            code: types_1.ErrorCode.ValidationError,
             message: 'Calendar period cannot have a negative amount',
         });
     }
@@ -3562,25 +3514,25 @@ function meshCalendarPeriodToCalendarPeriod(period) {
     const { unit: rawUnit, amount } = period;
     let unit;
     if (rawUnit.isSecond) {
-        unit = types_2.CalendarUnit.Second;
+        unit = types_1.CalendarUnit.Second;
     }
     else if (rawUnit.isMinute) {
-        unit = types_2.CalendarUnit.Minute;
+        unit = types_1.CalendarUnit.Minute;
     }
     else if (rawUnit.isHour) {
-        unit = types_2.CalendarUnit.Hour;
+        unit = types_1.CalendarUnit.Hour;
     }
     else if (rawUnit.isDay) {
-        unit = types_2.CalendarUnit.Day;
+        unit = types_1.CalendarUnit.Day;
     }
     else if (rawUnit.isWeek) {
-        unit = types_2.CalendarUnit.Week;
+        unit = types_1.CalendarUnit.Week;
     }
     else if (rawUnit.isMonth) {
-        unit = types_2.CalendarUnit.Month;
+        unit = types_1.CalendarUnit.Month;
     }
     else {
-        unit = types_2.CalendarUnit.Year;
+        unit = types_1.CalendarUnit.Year;
     }
     return {
         unit,
@@ -3613,7 +3565,7 @@ function scheduleSpecToMeshScheduleSpec(details, context) {
     const { start, period, repetitions } = details;
     return context.createType('PalletAssetCheckpointScheduleSpec', {
         start: start && dateToMoment(start, context),
-        period: calendarPeriodToMeshCalendarPeriod(period !== null && period !== void 0 ? period : { unit: types_2.CalendarUnit.Month, amount: new bignumber_js_1.default(0) }, context),
+        period: calendarPeriodToMeshCalendarPeriod(period !== null && period !== void 0 ? period : { unit: types_1.CalendarUnit.Month, amount: new bignumber_js_1.default(0) }, context),
         remaining: bigNumberToU64(repetitions || new bignumber_js_1.default(0), context),
     });
 }