@polymeshassociation/polymesh-sdk 25.1.1 → 26.0.0-alpha.1

package/utils/conversion.js

@@ -26,10 +26,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.stringToH512 = exports.stringToU8aFixed = exports.tickerToString = exports.stringToTickerKey = exports.stringToTicker = exports.bytesToString = exports.stringToBytes = exports.boolToBoolean = exports.booleanToBool = exports.tickerToDid = void 0;
-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.internalNftTypeToNftType = 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 = exports.u32ToBigNumber = void 0;
-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.nftDispatchErrorToTransferError = exports.transferConditionToTransferRestriction = exports.identitiesSetToIdentities = exports.identitiesToBtreeSet = exports.transferRestrictionToPolymeshTransferCondition = exports.claimIssuerToMeshClaimIssuer = exports.claimTypeToMeshClaimType = exports.nftMovementToPortfolioFund = exports.fungibleMovementToPortfolioFund = exports.nftToMeshNft = 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 = exports.assetComplianceResultToCompliance = exports.txTagToExtrinsicIdentifier = void 0;
-exports.childKeysWithAuthToCreateChildIdentitiesWithAuth = exports.secondaryAccountWithAuthToSecondaryKeyWithAuth = exports.receiptDetailsToMeshReceiptDetails = exports.offChainMetadataToMeshReceiptMetadata = exports.signatureToMeshRuntimeMultiSignature = exports.createRawExtrinsicStatus = exports.assetCountToRaw = exports.mediatorAffirmationStatusToStatus = exports.toHistoricalSettlements = exports.oldMiddlewareDataToHistoricalSettlements = exports.toCustomClaimTypeWithIdentity = exports.nftInputToNftMetadataVec = exports.nftInputToNftMetadataAttribute = exports.meshNftToNftId = exports.meshMetadataKeyToMetadataKey = exports.collectionKeysToMetadataKeys = exports.middlewareAuthorizationDataToAuthorization = exports.middlewarePermissionsDataToPermissions = exports.datesToScheduleCheckpoints = exports.middlewareAgentGroupDataToPermissionGroup = exports.legToOffChainLeg = exports.legToNonFungibleLeg = exports.legToFungibleLeg = exports.middlewarePortfolioDataToPortfolio = exports.expiryToMoment = exports.middlewareInstructionToHistoricInstruction = exports.middlewareLegToLeg = exports.oldMiddlewareInstructionToHistoricInstruction = exports.portfolioIdStringToPortfolio = 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 = exports.createStat2ndKey = exports.transferRestrictionTypeToStatOpType = void 0;
+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.stringToH512 = exports.stringToU8aFixed = exports.assetToMeshAssetIdWithKey = exports.assetToMeshAssetId = exports.assetToMeshAssetIdKey = exports.meshAssetToAssetId = exports.assetIdToString = exports.tickerToString = exports.stringToAssetIdKey = exports.stringToTickerKey = exports.stringToAssetId = exports.stringToTicker = exports.bytesToString = exports.stringToBytes = exports.boolToBoolean = exports.booleanToBool = exports.tickerToDid = void 0;
+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.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.internalNftTypeToNftType = 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 = exports.u32ToBigNumber = exports.bigNumberToU32 = exports.meshPermissionsToPermissionsV2 = exports.meshPermissionsToPermissions = exports.extrinsicPermissionsToTransactionPermissions = exports.permissionsToMeshPermissions = exports.transactionPermissionsToExtrinsicPermissions = exports.transactionPermissionsToTxGroups = exports.txGroupToTxTags = void 0;
+exports.caTaxWithholdingsToMeshTaxWithholdings = exports.targetsToTargetIdentities = exports.targetIdentitiesToCorporateActionTargets = exports.checkpointToRecordDateSpec = exports.corporateActionKindToCaKind = exports.meshCorporateActionToCorporateActionParams = exports.fundraiserToOfferingDetails = exports.fundraiserTierToTier = exports.middlewarePortfolioToPortfolio = exports.permissionsLikeToPermissions = exports.offeringTierToPriceTier = exports.transferReportToTransferBreakdown = exports.granularCanTransferResultToTransferBreakdown = exports.nftDispatchErrorToTransferError = exports.assetDispatchErrorToTransferError = exports.transferConditionToTransferRestriction = exports.identitiesSetToIdentities = exports.identitiesToBtreeSet = exports.transferRestrictionToPolymeshTransferCondition = exports.claimIssuerToMeshClaimIssuer = exports.claimTypeToMeshClaimType = exports.nftMovementToPortfolioFund = exports.fungibleMovementToPortfolioFund = exports.nftToMeshNft = 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 = exports.assetComplianceReportToCompliance = exports.assetComplianceResultToCompliance = exports.txTagToExtrinsicIdentifier = exports.extrinsicIdentifierToTxTag = exports.txTagToProtocolOp = exports.complianceRequirementToRequirement = exports.complianceRequirementReportToRequirementCompliance = exports.complianceRequirementResultToRequirementCompliance = exports.requirementToComplianceRequirement = exports.trustedClaimIssuerToTrustedIssuer = exports.trustedIssuerToTrustedClaimIssuer = void 0;
+exports.createRawExtrinsicStatus = exports.assetCountToRaw = exports.mediatorAffirmationStatusToStatus = exports.toHistoricalSettlements = exports.toCustomClaimTypeWithIdentity = exports.nftInputToNftMetadataVec = exports.nftInputToNftMetadataAttribute = exports.meshNftToNftId = exports.meshMetadataKeyToMetadataKey = exports.collectionKeysToMetadataKeys = exports.middlewareAuthorizationDataToAuthorization = exports.middlewarePermissionsDataToPermissions = exports.datesToScheduleCheckpoints = exports.middlewareAgentGroupDataToPermissionGroup = exports.legToOffChainLeg = exports.legToNonFungibleLeg = exports.legToFungibleLeg = exports.middlewarePortfolioDataToPortfolio = exports.expiryToMoment = exports.middlewareInstructionToHistoricInstruction = exports.middlewareLegToLeg = exports.portfolioIdStringToPortfolio = exports.instructionMemoToString = exports.metadataValueDetailToMeshMetadataValueDetail = exports.metadataValueToMeshMetadataValue = exports.meshMetadataValueToMetadataValue = exports.metadataToMeshMetadataKey = exports.meshMetadataSpecToMetadataSpec = exports.metadataSpecToMeshMetadataSpec = exports.meshProposalStateToProposalStatus = exports.meshProposalStatusToProposalStatus = exports.inputStatTypeToMeshStatType = exports.countStatInputToStatUpdates = 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 = void 0;
+exports.childKeysWithAuthToCreateChildIdentitiesWithAuth = exports.secondaryAccountWithAuthToSecondaryKeyWithAuth = exports.receiptDetailsToMeshReceiptDetails = exports.offChainMetadataToMeshReceiptMetadata = exports.signatureToMeshRuntimeMultiSignature = void 0;
 const util_1 = require("@polkadot/util");
 const util_crypto_1 = require("@polkadot/util-crypto");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -40,7 +41,6 @@ const utils_2 = require("../generated/utils");
 const internal_1 = require("../internal");
 const types_1 = require("../middleware/types");
 const typesV1_1 = require("../middleware/typesV1");
-const typesV6_1 = require("../middleware/typesV6");
 const types_2 = require("../types");
 const internal_2 = require("../types/internal");
 const utils_3 = require("../types/utils");
@@ -91,6 +91,13 @@ function stringToTicker(ticker, context) {
     return context.createType('PolymeshPrimitivesTicker', (0, internal_3.padString)(ticker, constants_1.MAX_TICKER_LENGTH));
 }
 exports.stringToTicker = stringToTicker;
+/**
+ * @hidden
+ */
+function stringToAssetId(assetId, context) {
+    return context.createType('PolymeshPrimitivesAssetAssetID', assetId);
+}
+exports.stringToAssetId = stringToAssetId;
 /**
  * @hidden
  */
@@ -98,6 +105,13 @@ function stringToTickerKey(ticker, context) {
     return { Ticker: stringToTicker(ticker, context) };
 }
 exports.stringToTickerKey = stringToTickerKey;
+/**
+ * @hidden
+ */
+function stringToAssetIdKey(assetId, context) {
+    return { AssetId: stringToAssetId(assetId, context) };
+}
+exports.stringToAssetIdKey = stringToAssetIdKey;
 /**
  * @hidden
  */
@@ -105,6 +119,65 @@ function tickerToString(ticker) {
     return (0, internal_3.removePadding)((0, util_1.u8aToString)(ticker));
 }
 exports.tickerToString = tickerToString;
+/**
+ * @hidden
+ */
+function assetIdToString(assetId) {
+    return assetId.toString();
+}
+exports.assetIdToString = assetIdToString;
+/**
+ * @hidden
+ */
+function meshAssetToAssetId(value, context) {
+    const { isV6 } = context;
+    /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+    if (isV6) {
+        return tickerToString(value);
+    }
+    return assetIdToString(value);
+}
+exports.meshAssetToAssetId = meshAssetToAssetId;
+/**
+ * @hidden
+ */
+function assetToMeshAssetIdKey(value, context) {
+    const { isV6 } = context;
+    /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+    if (isV6) {
+        return stringToTickerKey(value, context);
+    }
+    return stringToAssetIdKey(value, context);
+}
+exports.assetToMeshAssetIdKey = assetToMeshAssetIdKey;
+/**
+ * @hidden
+ */
+function assetToMeshAssetId({ id }, context) {
+    const { isV6 } = context;
+    /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+    if (isV6) {
+        return stringToTicker(id, context);
+    }
+    return stringToAssetId(id, context);
+}
+exports.assetToMeshAssetId = assetToMeshAssetId;
+/**
+ * @hidden
+ */
+function assetToMeshAssetIdWithKey({ id }, context) {
+    const { isV6 } = context;
+    /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+    if (isV6) {
+        return {
+            ticker: stringToTicker(id, context),
+        };
+    }
+    return {
+        assetId: stringToAssetId(id, context),
+    };
+}
+exports.assetToMeshAssetIdWithKey = assetToMeshAssetIdWithKey;
 /**
  * @hidden
  */
@@ -633,7 +706,7 @@ function initExtrinsicDict(txValues, message) {
 /**
  * @hidden
  */
-function buildPalletPermissions(transactions) {
+function buildPalletPermissions(transactions, isV6) {
     let extrinsic;
     const message = 'Attempting to add permissions for specific transactions as well as the entire module';
     const { values: txValues, exceptions = [], type } = transactions;
@@ -660,7 +733,7 @@ function buildPalletPermissions(transactions) {
             });
         }
     });
-    const pallets = (0, lodash_1.map)(extrinsicDict, (val, key) => {
+    const getDispatchables = (val) => {
         let dispatchables;
         if (val === null) {
             dispatchables = 'Whole';
@@ -678,13 +751,22 @@ function buildPalletPermissions(transactions) {
                 };
             }
         }
+        return dispatchables;
+    };
+    const palletsV6 = (0, lodash_1.map)(extrinsicDict, (val, key) => {
         return {
             /* eslint-disable @typescript-eslint/naming-convention */
-            pallet_name: key,
-            dispatchable_names: dispatchables,
+            palletName: key,
+            dispatchableNames: getDispatchables(val),
             /* eslint-enable @typescript-eslint/naming-convention */
         };
     });
+    const palletsV7 = new Map();
+    (0, lodash_1.forEach)(extrinsicDict, (val, key) => {
+        palletsV7.set(key, { extrinsics: getDispatchables(val) });
+    });
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    const pallets = isV6 ? palletsV6 : palletsV7;
     if (type === types_2.PermissionType.Include) {
         extrinsic = {
             These: pallets,
@@ -701,7 +783,13 @@ function buildPalletPermissions(transactions) {
  * @hidden
  */
 function transactionPermissionsToExtrinsicPermissions(transactionPermissions, context) {
-    return context.createType('PolymeshPrimitivesSubsetSubsetRestrictionPalletPermissions', transactionPermissions ? buildPalletPermissions(transactionPermissions) : 'Whole');
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    if (context.isV6) {
+        return context.createType('PolymeshPrimitivesSubsetSubsetRestrictionPalletPermissions', transactionPermissions
+            ? buildPalletPermissions(transactionPermissions, context.isV6)
+            : 'Whole');
+    }
+    return context.createType('PolymeshPrimitivesSecondaryKeyExtrinsicPermissions', transactionPermissions ? buildPalletPermissions(transactionPermissions, context.isV6) : 'Whole');
 }
 exports.transactionPermissionsToExtrinsicPermissions = transactionPermissionsToExtrinsicPermissions;
 /**
@@ -713,8 +801,8 @@ function permissionsToMeshPermissions(permissions, context) {
     let asset = 'Whole';
     if (assets) {
         const { values: assetValues, type } = assets;
-        assetValues.sort(({ ticker: tickerA }, { ticker: tickerB }) => tickerA.localeCompare(tickerB));
-        const tickers = assetValues.map(({ ticker }) => stringToTicker(ticker, context));
+        assetValues.sort(({ id: assetIdA }, { id: assetIdB }) => assetIdA.localeCompare(assetIdB));
+        const tickers = assetValues.map(assetValue => assetToMeshAssetId(assetValue, context));
         if (type === types_2.PermissionType.Include) {
             asset = {
                 These: tickers,
@@ -755,7 +843,7 @@ const formatTxTag = (dispatchable, moduleName) => {
 /**
  * @hidden
  */
-function extrinsicPermissionsToTransactionPermissions(permissions) {
+function extrinsicPermissionsToTransactionPermissions(permissions, context) {
     let extrinsicType;
     let pallets;
     if (permissions.isThese) {
@@ -769,33 +857,67 @@ function extrinsicPermissionsToTransactionPermissions(permissions) {
     let txValues = [];
     let exceptions = [];
     if (pallets) {
-        pallets.forEach(({ palletName, dispatchableNames }) => {
-            const moduleName = (0, util_1.stringLowerFirst)(bytesToString(palletName));
-            if (dispatchableNames.isExcept) {
-                const dispatchables = [...dispatchableNames.asExcept];
-                exceptions = [
-                    ...exceptions,
-                    ...dispatchables.map(name => formatTxTag(bytesToString(name), moduleName)),
-                ];
-                txValues = [...txValues, moduleName];
-            }
-            else if (dispatchableNames.isThese) {
-                const dispatchables = [...dispatchableNames.asThese];
-                txValues = [
-                    ...txValues,
-                    ...dispatchables.map(name => formatTxTag(bytesToString(name), moduleName)),
-                ];
-            }
-            else {
-                txValues = [...txValues, moduleName];
-            }
-        });
-        const result = {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            type: extrinsicType,
-            values: txValues,
-        };
-        return exceptions.length ? Object.assign(Object.assign({}, result), { exceptions }) : result;
+        /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+        if (context.isV6) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            pallets // NOSONAR
+                .forEach(({ palletName, dispatchableNames }) => {
+                const moduleName = (0, util_1.stringLowerFirst)(bytesToString(palletName));
+                if (dispatchableNames.isExcept) {
+                    const dispatchables = [...dispatchableNames.asExcept];
+                    exceptions = [
+                        ...exceptions,
+                        ...dispatchables.map(name => formatTxTag(bytesToString(name), moduleName)),
+                    ];
+                    txValues = [...txValues, moduleName];
+                }
+                else if (dispatchableNames.isThese) {
+                    const dispatchables = [...dispatchableNames.asThese];
+                    txValues = [
+                        ...txValues,
+                        ...dispatchables.map(name => formatTxTag(bytesToString(name), moduleName)),
+                    ];
+                }
+                else {
+                    txValues = [...txValues, moduleName];
+                }
+            });
+            const result = {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                type: extrinsicType,
+                values: txValues,
+            };
+            return exceptions.length ? Object.assign(Object.assign({}, result), { exceptions }) : result;
+        }
+        else {
+            pallets.forEach(({ extrinsics: dispatchableNames }, palletName) => {
+                const moduleName = (0, util_1.stringLowerFirst)(textToString(palletName));
+                if (dispatchableNames.isExcept) {
+                    const dispatchables = [...dispatchableNames.asExcept];
+                    exceptions = [
+                        ...exceptions,
+                        ...dispatchables.map(name => formatTxTag(textToString(name), moduleName)),
+                    ];
+                    txValues = [...txValues, moduleName];
+                }
+                else if (dispatchableNames.isThese) {
+                    const dispatchables = [...dispatchableNames.asThese];
+                    txValues = [
+                        ...txValues,
+                        ...dispatchables.map(name => formatTxTag(textToString(name), moduleName)),
+                    ];
+                }
+                else {
+                    txValues = [...txValues, moduleName];
+                }
+            });
+            const result = {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                type: extrinsicType,
+                values: txValues,
+            };
+            return exceptions.length ? Object.assign(Object.assign({}, result), { exceptions }) : result;
+        }
     }
     return null;
 }
@@ -820,12 +942,12 @@ function meshPermissionsToPermissions(permissions, context) {
     }
     if (assetsPermissions) {
         assets = {
-            values: [...assetsPermissions].map(ticker => new internal_1.FungibleAsset({ ticker: tickerToString(ticker) }, context)),
+            values: [...assetsPermissions].map(assetId => new internal_1.FungibleAsset({ assetId: meshAssetToAssetId(assetId, context) }, context)),
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             type: assetsType,
         };
     }
-    transactions = extrinsicPermissionsToTransactionPermissions(extrinsic);
+    transactions = extrinsicPermissionsToTransactionPermissions(extrinsic, context);
     let portfoliosType;
     let portfolioIds;
     if (portfolio.isThese) {
@@ -851,6 +973,74 @@ function meshPermissionsToPermissions(permissions, context) {
     };
 }
 exports.meshPermissionsToPermissions = meshPermissionsToPermissions;
+/**
+ * @hidden
+ */
+function meshPermissionsToPermissionsV2(account, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { polymeshApi: { query: { identity: { keyAssetPermissions, keyExtrinsicPermissions, keyPortfolioPermissions }, }, }, } = context;
+        const rawAccountId = stringToAccountId(account.address, context);
+        const multiResult = yield (0, internal_3.requestMulti)(context, [
+            [keyAssetPermissions, rawAccountId],
+            [keyExtrinsicPermissions, rawAccountId],
+            [keyPortfolioPermissions, rawAccountId],
+        ]);
+        const [asset, extrinsic, portfolio] = multiResult;
+        let assets = null;
+        let transactions = null;
+        let portfolios = null;
+        let assetsType;
+        let assetsPermissions;
+        if (asset.isSome) {
+            const rawAssetPermissions = asset.unwrap();
+            if (rawAssetPermissions.isThese) {
+                assetsType = types_2.PermissionType.Include;
+                assetsPermissions = rawAssetPermissions.asThese;
+            }
+            else if (rawAssetPermissions.isExcept) {
+                assetsType = types_2.PermissionType.Exclude;
+                assetsPermissions = rawAssetPermissions.asExcept;
+            }
+        }
+        if (assetsPermissions) {
+            assets = {
+                values: [...assetsPermissions].map(assetId => new internal_1.FungibleAsset({ assetId: meshAssetToAssetId(assetId, context) }, context)),
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                type: assetsType,
+            };
+        }
+        if (extrinsic.isSome) {
+            transactions = extrinsicPermissionsToTransactionPermissions(extrinsic.unwrap(), context);
+        }
+        let portfoliosType;
+        let portfolioIds;
+        if (portfolio.isSome) {
+            const rawPortfolioPermissions = portfolio.unwrap();
+            if (rawPortfolioPermissions.isThese) {
+                portfoliosType = types_2.PermissionType.Include;
+                portfolioIds = rawPortfolioPermissions.asThese;
+            }
+            else if (rawPortfolioPermissions.isExcept) {
+                portfoliosType = types_2.PermissionType.Exclude;
+                portfolioIds = rawPortfolioPermissions.asExcept;
+            }
+        }
+        if (portfolioIds) {
+            portfolios = {
+                values: [...portfolioIds].map(portfolioId => meshPortfolioIdToPortfolio(portfolioId, context)),
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                type: portfoliosType,
+            };
+        }
+        return {
+            assets,
+            transactions,
+            transactionGroups: transactions ? transactionPermissionsToTxGroups(transactions) : [],
+            portfolios,
+        };
+    });
+}
+exports.meshPermissionsToPermissionsV2 = meshPermissionsToPermissionsV2;
 /**
  * @hidden
  */
@@ -929,22 +1119,27 @@ function authorizationToAuthorizationData(auth, context) {
     else if (type === types_2.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_2.AuthorizationType.TransferAssetOwnership) {
+        /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+        value = context.isV6
+            ? stringToTicker(auth.value, context)
+            : stringToAssetId(auth.value, context);
+    }
+    else if (auth.type === types_2.AuthorizationType.TransferTicker) {
         value = stringToTicker(auth.value, context);
     }
     else if (type === types_2.AuthorizationType.RotatePrimaryKeyToSecondary) {
         value = permissionsToMeshPermissions(auth.value, context);
     }
     else if (type === types_2.AuthorizationType.BecomeAgent) {
-        const ticker = stringToTicker(auth.value.asset.ticker, context);
+        const assetId = assetToMeshAssetId(auth.value.asset, context);
         if (auth.value instanceof internal_1.CustomPermissionGroup) {
             const { id } = auth.value;
-            value = [ticker, permissionGroupIdentifierToAgentGroup({ custom: id }, context)];
+            value = [assetId, permissionGroupIdentifierToAgentGroup({ custom: id }, context)];
         }
         else {
             const { type: groupType } = auth.value;
-            value = [ticker, permissionGroupIdentifierToAgentGroup(groupType, context)];
+            value = [assetId, permissionGroupIdentifierToAgentGroup(groupType, context)];
         }
     }
     else {
@@ -990,13 +1185,11 @@ function bigNumberToBalance(value, context, divisible = true) {
             });
         }
     }
-    else {
-        if (value.decimalPlaces()) {
-            throw new internal_1.PolymeshError({
-                code: types_2.ErrorCode.ValidationError,
-                message: 'The value has decimals but the Asset is indivisible',
-            });
-        }
+    else if (value.decimalPlaces()) {
+        throw new internal_1.PolymeshError({
+            code: types_2.ErrorCode.ValidationError,
+            message: 'The value has decimals but the Asset is indivisible',
+        });
     }
     return context.createType('Balance', value.shiftedBy(6).toString());
 }
@@ -1011,26 +1204,26 @@ exports.balanceToBigNumber = balanceToBigNumber;
 /**
  * Assembles permissions group identifier + ticker into appropriate permission group based on group identifier
  */
-function assemblePermissionGroup(permissionGroupIdentifier, ticker, context) {
+function assemblePermissionGroup(permissionGroupIdentifier, assetId, context) {
     switch (permissionGroupIdentifier) {
         case types_2.PermissionGroupType.ExceptMeta:
         case types_2.PermissionGroupType.Full:
         case types_2.PermissionGroupType.PolymeshV1Caa:
         case types_2.PermissionGroupType.PolymeshV1Pia: {
-            return new internal_1.KnownPermissionGroup({ type: permissionGroupIdentifier, ticker }, context);
+            return new internal_1.KnownPermissionGroup({ type: permissionGroupIdentifier, assetId }, context);
         }
         default: {
             const { custom: id } = permissionGroupIdentifier;
-            return new internal_1.CustomPermissionGroup({ id, ticker }, context);
+            return new internal_1.CustomPermissionGroup({ id, assetId }, context);
         }
     }
 }
 /**
  * @hidden
  */
-function agentGroupToPermissionGroup(agentGroup, ticker, context) {
+function agentGroupToPermissionGroup(agentGroup, assetId, context) {
     const permissionGroupIdentifier = agentGroupToPermissionGroupIdentifier(agentGroup);
-    return assemblePermissionGroup(permissionGroupIdentifier, ticker, context);
+    return assemblePermissionGroup(permissionGroupIdentifier, assetId, context);
 }
 exports.agentGroupToPermissionGroup = agentGroupToPermissionGroup;
 /**
@@ -1065,7 +1258,7 @@ function authorizationDataToAuthorization(auth, context) {
     if (auth.isTransferAssetOwnership) {
         return {
             type: types_2.AuthorizationType.TransferAssetOwnership,
-            value: tickerToString(auth.asTransferAssetOwnership),
+            value: meshAssetToAssetId(auth.asTransferAssetOwnership, context),
         };
     }
     if (auth.isPortfolioCustody) {
@@ -1092,10 +1285,10 @@ function authorizationDataToAuthorization(auth, context) {
         };
     }
     if (auth.isBecomeAgent) {
-        const [ticker, agentGroup] = auth.asBecomeAgent;
+        const [assetId, agentGroup] = auth.asBecomeAgent;
         return {
             type: types_2.AuthorizationType.BecomeAgent,
-            value: agentGroupToPermissionGroup(agentGroup, tickerToString(ticker), context),
+            value: agentGroupToPermissionGroup(agentGroup, meshAssetToAssetId(assetId, context), context),
         };
     }
     if (auth.isRotatePrimaryKeyToSecondary) {
@@ -1610,49 +1803,55 @@ function cddStatusToBoolean(cddStatus) {
     return false;
 }
 exports.cddStatusToBoolean = cddStatusToBoolean;
-/**
- * @hidden
- */
-function canTransferResultToTransferStatus(canTransferResult) {
-    if (canTransferResult.isErr) {
-        throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.UnexpectedError,
-            message: `Error while checking transfer validity: ${bytesToString(canTransferResult.asErr)}`,
-        });
-    }
-    return u8ToTransferStatus(canTransferResult.asOk);
-}
-exports.canTransferResultToTransferStatus = canTransferResultToTransferStatus;
 /**
  * @hidden
  */
 function scopeToMeshScope(scope, context) {
-    const { type, value } = scope;
-    let scopeValue;
-    switch (type) {
-        case types_2.ScopeType.Ticker:
-            scopeValue = stringToTicker(value, context);
-            break;
-        case types_2.ScopeType.Identity:
-            scopeValue = stringToIdentityId(value, context);
-            break;
-        default:
-            scopeValue = value;
-            break;
-    }
-    return context.createType('Scope', {
-        [type]: scopeValue,
+    return __awaiter(this, void 0, void 0, function* () {
+        const { type, value } = scope;
+        let scopeType = type;
+        let baseAsset;
+        const { isV6 } = context;
+        let scopeValue;
+        switch (type) {
+            case types_2.ScopeType.Ticker: // NOSONAR
+            case types_2.ScopeType.Asset:
+                baseAsset = yield (0, internal_3.asBaseAsset)(value, context);
+                scopeValue = assetToMeshAssetId(baseAsset, context);
+                /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+                scopeType = isV6 ? types_2.ScopeType.Ticker : types_2.ScopeType.Asset; // NOSONAR
+                break;
+            case types_2.ScopeType.Identity:
+                scopeValue = stringToIdentityId(value, context);
+                break;
+            default:
+                scopeValue = value;
+                break;
+        }
+        return { [scopeType]: scopeValue };
     });
 }
 exports.scopeToMeshScope = scopeToMeshScope;
 /**
  * @hidden
  */
-function meshScopeToScope(scope) {
-    if (scope.isTicker) {
+function meshScopeToScope(scope, context) {
+    const { isV6 } = context;
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    if (isV6 &&
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        scope.isTicker // NOSONAR
+    ) {
         return {
             type: types_2.ScopeType.Ticker,
-            value: tickerToString(scope.asTicker),
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            value: tickerToString(scope.asTicker), // NOSONAR
+        };
+    }
+    else if (scope.isAsset) {
+        return {
+            type: types_2.ScopeType.Asset,
+            value: assetIdToString(scope.asAsset),
         };
     }
     if (scope.isIdentity) {
@@ -1685,40 +1884,42 @@ exports.cddIdToString = cddIdToString;
  * @hidden
  */
 function claimToMeshClaim(claim, context) {
-    let value;
-    switch (claim.type) {
-        case types_2.ClaimType.CustomerDueDiligence: {
-            value = stringToCddId(claim.id, context);
-            break;
-        }
-        case types_2.ClaimType.Jurisdiction: {
-            const { code, scope } = claim;
-            value = (0, utils_3.tuple)(code, scopeToMeshScope(scope, context));
-            break;
-        }
-        case types_2.ClaimType.Custom: {
-            const { customClaimTypeId, scope } = claim;
-            value = (0, utils_3.tuple)(bigNumberToU32(customClaimTypeId, context), scopeToMeshScope(scope, context));
-            break;
-        }
-        default: {
-            value = scopeToMeshScope(claim.scope, context);
+    return __awaiter(this, void 0, void 0, function* () {
+        let value;
+        switch (claim.type) {
+            case types_2.ClaimType.CustomerDueDiligence: {
+                value = stringToCddId(claim.id, context);
+                break;
+            }
+            case types_2.ClaimType.Jurisdiction: {
+                const { code, scope } = claim;
+                value = (0, utils_3.tuple)(code, yield scopeToMeshScope(scope, context));
+                break;
+            }
+            case types_2.ClaimType.Custom: {
+                const { customClaimTypeId, scope } = claim;
+                value = (0, utils_3.tuple)(bigNumberToU32(customClaimTypeId, context), yield scopeToMeshScope(scope, context));
+                break;
+            }
+            default: {
+                value = yield scopeToMeshScope(claim.scope, context);
+            }
         }
-    }
-    return context.createType('PolymeshPrimitivesIdentityClaimClaim', { [claim.type]: value });
+        return context.createType('PolymeshPrimitivesIdentityClaimClaim', { [claim.type]: value });
+    });
 }
 exports.claimToMeshClaim = claimToMeshClaim;
 /**
  * @hidden
  */
-function middlewareScopeToScope(scope) {
+function middlewareScopeToScope(scope, context) {
     const { type, value } = scope;
     switch (type) {
-        case typesV1_1.ClaimScopeTypeEnum.Ticker:
+        case typesV1_1.ClaimScopeTypeEnum.Ticker: // NOSONAR
         case typesV1_1.ClaimScopeTypeEnum.Asset:
             return {
-                type: types_2.ScopeType.Ticker,
-                value: (0, internal_3.getAssetIdFromMiddleware)({ id: value, ticker: value }),
+                type: types_2.ScopeType.Asset,
+                value: (0, internal_3.getAssetIdFromMiddleware)({ id: value, ticker: value }, context),
             };
         case typesV1_1.ClaimScopeTypeEnum.Identity:
         case typesV1_1.ClaimScopeTypeEnum.Custom:
@@ -1740,20 +1941,12 @@ function scopeToMiddlewareScope(scope, context) {
     return __awaiter(this, void 0, void 0, function* () {
         const { type, value } = scope;
         switch (type) {
-            case types_2.ScopeType.Ticker: {
-                const middlewareAssetId = yield (0, internal_3.getAssetIdForMiddleware)(value, context);
-                if (value === middlewareAssetId) {
-                    // old SQ is used
-                    return {
-                        type: typesV1_1.ClaimScopeTypeEnum.Ticker,
-                        value,
-                    };
-                }
+            case types_2.ScopeType.Ticker: // NOSONAR
+            case types_2.ScopeType.Asset:
                 return {
                     type: typesV1_1.ClaimScopeTypeEnum.Asset,
-                    value: middlewareAssetId,
+                    value: yield (0, internal_3.getAssetIdForMiddleware)(value, context),
                 };
-            }
             case types_2.ScopeType.Identity:
             case types_2.ScopeType.Custom:
                 return { type: typesV1_1.ClaimScopeTypeEnum[scope.type], value };
@@ -1777,38 +1970,38 @@ exports.middlewareEventDetailsToEventIdentifier = middlewareEventDetailsToEventI
 /**
  * @hidden
  */
-function meshClaimToClaim(claim) {
+function meshClaimToClaim(claim, context) {
     const type = claim.type;
     if (type === 'Jurisdiction') {
         const [code, scope] = claim.asJurisdiction;
         return {
             type: types_2.ClaimType.Jurisdiction,
             code: (0, utils_2.meshCountryCodeToCountryCode)(code),
-            scope: meshScopeToScope(scope),
+            scope: meshScopeToScope(scope, context),
         };
     }
     if (type === 'Accredited') {
         return {
             type: types_2.ClaimType.Accredited,
-            scope: meshScopeToScope(claim.asAccredited),
+            scope: meshScopeToScope(claim.asAccredited, context),
         };
     }
     if (type === 'Affiliate') {
         return {
             type: types_2.ClaimType.Affiliate,
-            scope: meshScopeToScope(claim.asAffiliate),
+            scope: meshScopeToScope(claim.asAffiliate, context),
         };
     }
     if (type === 'BuyLockup') {
         return {
             type: types_2.ClaimType.BuyLockup,
-            scope: meshScopeToScope(claim.asBuyLockup),
+            scope: meshScopeToScope(claim.asBuyLockup, context),
         };
     }
     if (type === 'SellLockup') {
         return {
             type: types_2.ClaimType.SellLockup,
-            scope: meshScopeToScope(claim.asSellLockup),
+            scope: meshScopeToScope(claim.asSellLockup, context),
         };
     }
     if (type === 'CustomerDueDiligence') {
@@ -1820,27 +2013,27 @@ function meshClaimToClaim(claim) {
     if (type === 'KnowYourCustomer') {
         return {
             type: types_2.ClaimType.KnowYourCustomer,
-            scope: meshScopeToScope(claim.asKnowYourCustomer),
+            scope: meshScopeToScope(claim.asKnowYourCustomer, context),
         };
     }
     if (type === 'Exempted') {
         return {
             type: types_2.ClaimType.Exempted,
-            scope: meshScopeToScope(claim.asExempted),
+            scope: meshScopeToScope(claim.asExempted, context),
         };
     }
     if (type === 'Custom') {
         const [rawId, scope] = claim.asCustom;
         return {
             type: types_2.ClaimType.Custom,
-            scope: meshScopeToScope(scope.unwrapOrDefault()),
+            scope: meshScopeToScope(scope.unwrapOrDefault(), context),
             customClaimTypeId: u32ToBigNumber(rawId),
         };
     }
     if (type === 'Blocked') {
         return {
             type: types_2.ClaimType.Blocked,
-            scope: meshScopeToScope(claim.asBlocked),
+            scope: meshScopeToScope(claim.asBlocked, context),
         };
     }
     throw new utils_1.UnreachableCaseError(type);
@@ -1949,46 +2142,48 @@ exports.trustedClaimIssuerToTrustedIssuer = trustedClaimIssuerToTrustedIssuer;
  * @hidden
  */
 function requirementToComplianceRequirement(requirement, context) {
-    const senderConditions = [];
-    const receiverConditions = [];
-    requirement.conditions.forEach(condition => {
-        let conditionContent;
-        let { type } = condition;
-        if ((0, typeguards_1.isSingleClaimCondition)(condition)) {
-            const { claim } = condition;
-            conditionContent = claimToMeshClaim(claim, context);
-        }
-        else if ((0, typeguards_1.isMultiClaimCondition)(condition)) {
-            const { claims } = condition;
-            conditionContent = claims.map(claim => claimToMeshClaim(claim, context));
-        }
-        else if ((0, typeguards_1.isIdentityCondition)(condition)) {
-            const { identity } = condition;
-            conditionContent = stringToTargetIdentity(signerToString(identity), context);
+    return __awaiter(this, void 0, void 0, function* () {
+        const senderConditions = [];
+        const receiverConditions = [];
+        for (const condition of requirement.conditions) {
+            let conditionContent;
+            let { type } = condition;
+            if ((0, typeguards_1.isSingleClaimCondition)(condition)) {
+                const { claim } = condition;
+                conditionContent = yield claimToMeshClaim(claim, context);
+            }
+            else if ((0, typeguards_1.isMultiClaimCondition)(condition)) {
+                const { claims } = condition;
+                conditionContent = yield Promise.all(claims.map(claim => claimToMeshClaim(claim, context)));
+            }
+            else if ((0, typeguards_1.isIdentityCondition)(condition)) {
+                const { identity } = condition;
+                conditionContent = stringToTargetIdentity(signerToString(identity), context);
+            }
+            else {
+                // IsExternalAgent does not exist as a condition type in Polymesh, it's SDK sugar
+                type = types_2.ConditionType.IsIdentity;
+                conditionContent = stringToTargetIdentity(null, context);
+            }
+            const { target, trustedClaimIssuers = [] } = condition;
+            const meshCondition = context.createType('PolymeshPrimitivesCondition', {
+                conditionType: {
+                    [type]: conditionContent,
+                },
+                issuers: trustedClaimIssuers.map(issuer => trustedClaimIssuerToTrustedIssuer(issuer, context)),
+            });
+            if ([types_2.ConditionTarget.Both, types_2.ConditionTarget.Receiver].includes(target)) {
+                receiverConditions.push(meshCondition);
+            }
+            if ([types_2.ConditionTarget.Both, types_2.ConditionTarget.Sender].includes(target)) {
+                senderConditions.push(meshCondition);
+            }
         }
-        else {
-            // IsExternalAgent does not exist as a condition type in Polymesh, it's SDK sugar
-            type = types_2.ConditionType.IsIdentity;
-            conditionContent = stringToTargetIdentity(null, context);
-        }
-        const { target, trustedClaimIssuers = [] } = condition;
-        const meshCondition = context.createType('PolymeshPrimitivesCondition', {
-            conditionType: {
-                [type]: conditionContent,
-            },
-            issuers: trustedClaimIssuers.map(issuer => trustedClaimIssuerToTrustedIssuer(issuer, context)),
+        return context.createType('PolymeshPrimitivesComplianceManagerComplianceRequirement', {
+            senderConditions,
+            receiverConditions,
+            id: bigNumberToU32(requirement.id, context),
         });
-        if ([types_2.ConditionTarget.Both, types_2.ConditionTarget.Receiver].includes(target)) {
-            receiverConditions.push(meshCondition);
-        }
-        if ([types_2.ConditionTarget.Both, types_2.ConditionTarget.Sender].includes(target)) {
-            senderConditions.push(meshCondition);
-        }
-    });
-    return context.createType('PolymeshPrimitivesComplianceManagerComplianceRequirement', {
-        senderConditions,
-        receiverConditions,
-        id: bigNumberToU32(requirement.id, context),
     });
 }
 exports.requirementToComplianceRequirement = requirementToComplianceRequirement;
@@ -1999,19 +2194,19 @@ function meshConditionTypeToCondition(meshConditionType, context) {
     if (meshConditionType.isIsPresent) {
         return {
             type: types_2.ConditionType.IsPresent,
-            claim: meshClaimToClaim(meshConditionType.asIsPresent),
+            claim: meshClaimToClaim(meshConditionType.asIsPresent, context),
         };
     }
     if (meshConditionType.isIsAbsent) {
         return {
             type: types_2.ConditionType.IsAbsent,
-            claim: meshClaimToClaim(meshConditionType.asIsAbsent),
+            claim: meshClaimToClaim(meshConditionType.asIsAbsent, context),
         };
     }
     if (meshConditionType.isIsAnyOf) {
         return {
             type: types_2.ConditionType.IsAnyOf,
-            claims: meshConditionType.asIsAnyOf.map(claim => meshClaimToClaim(claim)),
+            claims: meshConditionType.asIsAnyOf.map(claim => meshClaimToClaim(claim, context)),
         };
     }
     if (meshConditionType.isIsIdentity) {
@@ -2028,7 +2223,7 @@ function meshConditionTypeToCondition(meshConditionType, context) {
     }
     return {
         type: types_2.ConditionType.IsNoneOf,
-        claims: meshConditionType.asIsNoneOf.map(claim => meshClaimToClaim(claim)),
+        claims: meshConditionType.asIsNoneOf.map(claim => meshClaimToClaim(claim, context)),
     };
 }
 /**
@@ -2068,6 +2263,42 @@ function complianceRequirementResultToRequirementCompliance(complianceRequiremen
     };
 }
 exports.complianceRequirementResultToRequirementCompliance = complianceRequirementResultToRequirementCompliance;
+/**
+ * @hidden
+ */
+function complianceRequirementReportToRequirementCompliance(complianceRequirement, context) {
+    const conditions = [];
+    const conditionCompliancesAreEqual = ({ condition: aCondition, complies: aComplies }, { condition: bCondition, complies: bComplies }) => (0, internal_3.conditionsAreEqual)(aCondition, bCondition) && aComplies === bComplies;
+    complianceRequirement.senderConditions.forEach(({ condition: { conditionType, issuers }, satisfied }) => {
+        const newCondition = {
+            condition: Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_2.ConditionTarget.Sender, trustedClaimIssuers: issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context)) }),
+            complies: boolToBoolean(satisfied),
+        };
+        const existingCondition = conditions.find(condition => conditionCompliancesAreEqual(condition, newCondition));
+        if (!existingCondition) {
+            conditions.push(newCondition);
+        }
+    });
+    complianceRequirement.receiverConditions.forEach(({ condition: { conditionType, issuers }, satisfied }) => {
+        const newCondition = {
+            condition: Object.assign(Object.assign({}, meshConditionTypeToCondition(conditionType, context)), { target: types_2.ConditionTarget.Receiver, trustedClaimIssuers: issuers.map(trustedIssuer => trustedIssuerToTrustedClaimIssuer(trustedIssuer, context)) }),
+            complies: boolToBoolean(satisfied),
+        };
+        const existingCondition = conditions.find(condition => conditionCompliancesAreEqual(condition, newCondition));
+        if (existingCondition && existingCondition.condition.target === types_2.ConditionTarget.Sender) {
+            existingCondition.condition.target = types_2.ConditionTarget.Both;
+        }
+        else {
+            conditions.push(newCondition);
+        }
+    });
+    return {
+        id: u32ToBigNumber(complianceRequirement.id),
+        conditions,
+        complies: boolToBoolean(complianceRequirement.requirementSatisfied),
+    };
+}
+exports.complianceRequirementReportToRequirementCompliance = complianceRequirementReportToRequirementCompliance;
 /**
  * @hidden
  */
@@ -2107,7 +2338,8 @@ exports.complianceRequirementToRequirement = complianceRequirementToRequirement;
  */
 function txTagToProtocolOp(tag, context) {
     const protocolOpTags = [
-        types_2.TxTags.asset.RegisterTicker,
+        types_2.TxTags.asset.RegisterUniqueTicker,
+        types_2.TxTags.asset.RegisterUniqueTicker,
         types_2.TxTags.asset.Issue,
         types_2.TxTags.asset.AddDocuments,
         types_2.TxTags.asset.CreateAsset,
@@ -2169,6 +2401,19 @@ function assetComplianceResultToCompliance(assetComplianceResult, context) {
     };
 }
 exports.assetComplianceResultToCompliance = assetComplianceResultToCompliance;
+/**
+ * @hidden
+ */
+function assetComplianceReportToCompliance(assetComplianceReport, context) {
+    const report = assetComplianceReport.asOk;
+    const { requirements: rawRequirements, anyRequirementSatisfied: result, pausedCompliance: paused, } = report;
+    const requirements = rawRequirements.map(requirement => complianceRequirementReportToRequirementCompliance(requirement, context));
+    return {
+        requirements,
+        complies: boolToBoolean(paused) || boolToBoolean(result),
+    };
+}
+exports.assetComplianceReportToCompliance = assetComplianceReportToCompliance;
 /**
  * @hidden
  */
@@ -2335,7 +2580,7 @@ function middlewareClaimToClaimData(claim, context) {
         issuedAt: new Date(parseFloat(issuanceDate)),
         lastUpdatedAt: new Date(parseFloat(lastUpdateDate)),
         expiry: expiry ? new Date(parseFloat(expiry)) : null,
-        claim: (0, internal_3.createClaim)(type, jurisdiction, scope, cddId, customClaimTypeId ? new bignumber_js_1.default(customClaimTypeId) : undefined),
+        claim: (0, internal_3.createClaim)(type, jurisdiction, scope, cddId, customClaimTypeId ? new bignumber_js_1.default(customClaimTypeId) : undefined, context),
     };
 }
 exports.middlewareClaimToClaimData = middlewareClaimToClaimData;
@@ -2353,26 +2598,23 @@ exports.toIdentityWithClaimsArray = toIdentityWithClaimsArray;
 /**
  * @hidden
  */
-function nftToMeshNft(ticker, nfts, context) {
-    return context.createType('PolymeshPrimitivesNftNfTs', {
-        ticker: stringToTicker(ticker, context),
-        ids: nfts.map(id => bigNumberToU64((0, internal_3.asNftId)(id), context)),
-    });
+function nftToMeshNft(assetArgs, nfts, context) {
+    return context.createType('PolymeshPrimitivesNftNfTs', Object.assign(Object.assign({}, assetToMeshAssetIdWithKey(assetArgs, context)), { ids: nfts.map(id => bigNumberToU64((0, internal_3.asNftId)(id), context)) }));
 }
 exports.nftToMeshNft = nftToMeshNft;
 /**
  * @hidden
  */
 function fungibleMovementToPortfolioFund(portfolioItem, context) {
-    const { asset, amount, memo } = portfolioItem;
-    return context.createType('PolymeshPrimitivesPortfolioFund', {
-        description: {
-            Fungible: {
-                ticker: stringToTicker((0, internal_3.asTicker)(asset), context),
-                amount: bigNumberToBalance(amount, context),
+    return __awaiter(this, void 0, void 0, function* () {
+        const { asset, amount, memo } = portfolioItem;
+        const baseAsset = yield (0, internal_3.asBaseAsset)(asset, context);
+        return context.createType('PolymeshPrimitivesPortfolioFund', {
+            description: {
+                Fungible: Object.assign({ amount: bigNumberToBalance(amount, context) }, assetToMeshAssetIdWithKey(baseAsset, context)),
             },
-        },
-        memo: (0, internal_3.optionize)(stringToMemo)(memo, context),
+            memo: (0, internal_3.optionize)(stringToMemo)(memo, context),
+        });
     });
 }
 exports.fungibleMovementToPortfolioFund = fungibleMovementToPortfolioFund;
@@ -2380,15 +2622,15 @@ exports.fungibleMovementToPortfolioFund = fungibleMovementToPortfolioFund;
  * @hidden
  */
 function nftMovementToPortfolioFund(portfolioItem, context) {
-    const { asset, nfts, memo } = portfolioItem;
-    return context.createType('PolymeshPrimitivesPortfolioFund', {
-        description: {
-            NonFungible: {
-                ticker: stringToTicker((0, internal_3.asTicker)(asset), context),
-                ids: nfts.map(nftId => bigNumberToU64((0, internal_3.asNftId)(nftId), context)),
+    return __awaiter(this, void 0, void 0, function* () {
+        const { asset, nfts, memo } = portfolioItem;
+        const baseAsset = yield (0, internal_3.asBaseAsset)(asset, context);
+        return context.createType('PolymeshPrimitivesPortfolioFund', {
+            description: {
+                NonFungible: Object.assign(Object.assign({}, assetToMeshAssetIdWithKey(baseAsset, context)), { ids: nfts.map(nftId => bigNumberToU64((0, internal_3.asNftId)(nftId), context)) }),
             },
-        },
-        memo: (0, internal_3.optionize)(stringToMemo)(memo, context),
+            memo: (0, internal_3.optionize)(stringToMemo)(memo, context),
+        });
     });
 }
 exports.nftMovementToPortfolioFund = nftMovementToPortfolioFund;
@@ -2519,6 +2761,37 @@ function transferConditionToTransferRestriction(transferCondition, context) {
     }
 }
 exports.transferConditionToTransferRestriction = transferConditionToTransferRestriction;
+/**
+ * @hidden
+ */
+function assetDispatchErrorToTransferError(error, context) {
+    const { asset: assetErrors, portfolio: portfolioErrors, statistics: statisticsError, } = context.polymeshApi.errors;
+    const record = [
+        [assetErrors.InvalidGranularity, types_2.TransferError.InvalidGranularity],
+        [assetErrors.SenderSameAsReceiver, types_2.TransferError.SelfTransfer],
+        [assetErrors.InvalidTransferInvalidReceiverCDD, types_2.TransferError.InvalidReceiverCdd],
+        [assetErrors.InvalidTransferInvalidSenderCDD, types_2.TransferError.InvalidSenderCdd],
+        [assetErrors.InsufficientBalance, types_2.TransferError.InsufficientBalance],
+        [assetErrors.InvalidTransferFrozenAsset, types_2.TransferError.TransfersFrozen],
+        [portfolioErrors.PortfolioDoesNotExist, types_2.TransferError.InvalidSenderPortfolio],
+        [portfolioErrors.InsufficientPortfolioBalance, types_2.TransferError.InsufficientPortfolioBalance],
+        [assetErrors.InvalidTransferComplianceFailure, types_2.TransferError.ComplianceFailure],
+        [assetErrors.InvalidTransfer, types_2.TransferError.ComplianceFailure],
+        [statisticsError.InvalidTransferStatisticsFailure, types_2.TransferError.TransferNotAllowed],
+    ];
+    if (error.isModule) {
+        const moduleErr = error.asModule;
+        const errorCase = record.find(([augmentedError]) => augmentedError.is(moduleErr));
+        if (errorCase) {
+            return errorCase[1];
+        }
+    }
+    throw new internal_1.PolymeshError({
+        code: types_2.ErrorCode.UnexpectedError,
+        message: 'Received unknown Asset can transfer status',
+    });
+}
+exports.assetDispatchErrorToTransferError = assetDispatchErrorToTransferError;
 /**
  * @hidden
  */
@@ -2549,7 +2822,7 @@ exports.nftDispatchErrorToTransferError = nftDispatchErrorToTransferError;
  * @hidden
  */
 function granularCanTransferResultToTransferBreakdown(result, validateNftResult, context) {
-    const { invalidGranularity, selfTransfer, invalidReceiverCdd, invalidSenderCdd, senderInsufficientBalance: insufficientBalance, assetFrozen, portfolioValidityResult: { senderPortfolioDoesNotExist, receiverPortfolioDoesNotExist, senderInsufficientBalance, }, transferConditionResult, complianceResult, result: finalResult, } = result;
+    const { invalid_granularity: invalidGranularity, self_transfer: selfTransfer, invalid_receiver_cdd: invalidReceiverCdd, invalid_sender_cdd: invalidSenderCdd, 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);
@@ -2569,10 +2842,10 @@ function granularCanTransferResultToTransferBreakdown(result, validateNftResult,
     if (boolToBoolean(assetFrozen)) {
         general.push(types_2.TransferError.TransfersFrozen);
     }
-    if (boolToBoolean(senderPortfolioDoesNotExist)) {
+    if (boolToBoolean(senderPortfolioNotExists)) {
         general.push(types_2.TransferError.InvalidSenderPortfolio);
     }
-    if (boolToBoolean(receiverPortfolioDoesNotExist)) {
+    if (boolToBoolean(receiverPortfolioNotExists)) {
         general.push(types_2.TransferError.InvalidReceiverPortfolio);
     }
     if (boolToBoolean(senderInsufficientBalance)) {
@@ -2598,6 +2871,30 @@ function granularCanTransferResultToTransferBreakdown(result, validateNftResult,
     };
 }
 exports.granularCanTransferResultToTransferBreakdown = granularCanTransferResultToTransferBreakdown;
+/**
+ * @hidden
+ */
+function transferReportToTransferBreakdown(result, validateNftResult, complianceResult, context) {
+    let general = [];
+    let canTransfer = true;
+    if (validateNftResult === null || validateNftResult === void 0 ? void 0 : validateNftResult.length) {
+        const errors = result.map(error => nftDispatchErrorToTransferError(error, context));
+        general = Array.from(new Set([...general, ...errors]));
+        canTransfer = false;
+    }
+    if (result.length) {
+        const errors = result.map(error => assetDispatchErrorToTransferError(error, context));
+        general = Array.from(new Set([...general, ...errors]));
+        canTransfer = false;
+    }
+    return {
+        general,
+        compliance: assetComplianceReportToCompliance(complianceResult, context),
+        restrictions: [],
+        result: canTransfer,
+    };
+}
+exports.transferReportToTransferBreakdown = transferReportToTransferBreakdown;
 /**
  * @hidden
  */
@@ -2642,7 +2939,7 @@ function permissionsLikeToPermissions(permissionsLike, context) {
         assetPermissions = null;
     }
     else if (assets) {
-        assetPermissions = Object.assign(Object.assign({}, assets), { values: assets.values.map(ticker => typeof ticker !== 'string' ? ticker : new internal_1.FungibleAsset({ ticker }, context)) });
+        assetPermissions = Object.assign(Object.assign({}, assets), { values: assets.values.map(assetId => typeof assetId !== 'string' ? assetId : new internal_1.FungibleAsset({ assetId }, context)) });
     }
     if (transactions !== undefined) {
         transactionPermissions = transactions;
@@ -2741,7 +3038,7 @@ function fundraiserToOfferingDetails(fundraiser, name, context) {
         name: bytesToString(name),
         offeringPortfolio: meshPortfolioIdToPortfolio(offeringPortfolio, context),
         raisingPortfolio: meshPortfolioIdToPortfolio(raisingPortfolio, context),
-        raisingCurrency: tickerToString(raisingAsset),
+        raisingCurrency: meshAssetToAssetId(raisingAsset, context),
         tiers,
         venue: new internal_1.Venue({ id: u64ToBigNumber(venueId) }, context),
         start,
@@ -2851,7 +3148,7 @@ function targetsToTargetIdentities(targets, context) {
     }
     return context.createType('PalletCorporateActionsTargetIdentities', {
         identities: identities.map(identity => stringToIdentityId(signerToString(identity), context)),
-        treatment: context.createType('TargetTreatment', treatment),
+        treatment: context.createType('PalletCorporateActionsTargetTreatment', treatment),
     });
 }
 exports.targetsToTargetIdentities = targetsToTargetIdentities;
@@ -2870,7 +3167,7 @@ function distributionToDividendDistributionParams(distribution, context) {
     const { from, currency, perShare, amount, expiresAt: expiryDate, paymentAt: paymentDate, } = distribution;
     return {
         origin: meshPortfolioIdToPortfolio(from, context),
-        currency: tickerToString(currency),
+        currency: meshAssetToAssetId(currency, context),
         perShare: balanceToBigNumber(perShare),
         maxAmount: balanceToBigNumber(amount),
         expiryDate: expiryDate.isNone ? null : momentToDate(expiryDate.unwrap()),
@@ -2882,19 +3179,15 @@ exports.distributionToDividendDistributionParams = distributionToDividendDistrib
  * @hidden
  */
 function corporateActionIdentifierToCaId(corporateActionIdentifier, context) {
-    const { ticker, localId } = corporateActionIdentifier;
-    return context.createType('PalletCorporateActionsCaId', {
-        ticker: stringToTicker(ticker, context),
-        localId: bigNumberToU32(localId, context),
-    });
+    const { asset, localId } = corporateActionIdentifier;
+    return context.createType('PalletCorporateActionsCaId', Object.assign(Object.assign({}, assetToMeshAssetIdWithKey(asset, context)), { localId: bigNumberToU32(localId, context) }));
 }
 exports.corporateActionIdentifierToCaId = corporateActionIdentifierToCaId;
 /**
  * @hidden
  */
 function corporateActionParamsToMeshCorporateActionArgs(params, context) {
-    const { ticker, kind, declarationDate, checkpoint, description, targets, defaultTaxWithholding, taxWithholdings, } = params;
-    const rawTicker = stringToTicker(ticker, context);
+    const { asset, kind, declarationDate, checkpoint, description, targets, defaultTaxWithholding, taxWithholdings, } = params;
     const rawKind = corporateActionKindToCaKind(kind, context);
     const rawDeclDate = dateToMoment(declarationDate, context);
     const rawRecordDate = (0, internal_3.optionize)(checkpointToRecordDateSpec)(checkpoint, context);
@@ -2902,24 +3195,25 @@ function corporateActionParamsToMeshCorporateActionArgs(params, context) {
     const rawTargets = (0, internal_3.optionize)(targetsToTargetIdentities)(targets, context);
     const rawTax = (0, internal_3.optionize)(percentageToPermill)(defaultTaxWithholding, context);
     const rawWithholdings = (0, internal_3.optionize)(caTaxWithholdingsToMeshTaxWithholdings)(taxWithholdings, context);
-    return context.createType('PalletCorporateActionsInitiateCorporateActionArgs', {
-        ticker: rawTicker,
-        kind: rawKind,
-        declDate: rawDeclDate,
-        recordDate: rawRecordDate,
-        details: rawDetails,
-        targets: rawTargets,
-        defaultWithholdingTax: rawTax,
-        withholdingTax: rawWithholdings,
-    });
+    return context.createType('PalletCorporateActionsInitiateCorporateActionArgs', Object.assign(Object.assign({}, assetToMeshAssetIdWithKey(asset, context)), { kind: rawKind, declDate: rawDeclDate, recordDate: rawRecordDate, details: rawDetails, targets: rawTargets, defaultWithholdingTax: rawTax, withholdingTax: rawWithholdings }));
 }
 exports.corporateActionParamsToMeshCorporateActionArgs = corporateActionParamsToMeshCorporateActionArgs;
 /**
  * @hidden
  */
 function statisticsOpTypeToStatType(args, context) {
-    const { op, claimIssuer } = args;
-    return context.createType('PolymeshPrimitivesStatisticsStatType', { op, claimIssuer });
+    const { operationType, claimIssuer } = args;
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    if (context.isV6) {
+        return context.createType('PolymeshPrimitivesStatisticsStatType', {
+            op: operationType,
+            claimIssuer,
+        });
+    }
+    return context.createType('PolymeshPrimitivesStatisticsStatType', {
+        operationType,
+        claimIssuer,
+    });
 }
 exports.statisticsOpTypeToStatType = statisticsOpTypeToStatType;
 /**
@@ -2978,8 +3272,17 @@ exports.statUpdatesToBtreeStatUpdate = statUpdatesToBtreeStatUpdate;
 /**
  * @hidden
  */
-function meshStatToStatType(rawStat) {
-    const { op: { type }, claimIssuer, } = rawStat;
+function meshStatToStatType(rawStat, context) {
+    const claimIssuer = rawStat.claimIssuer;
+    let type;
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    if (context.isV6) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        type = rawStat.op.type; // NOSONAR
+    }
+    else {
+        type = rawStat.operationType.type;
+    }
     if (claimIssuer.isNone) {
         if (type === 'Count') {
             return types_2.StatType.Count;
@@ -3104,8 +3407,12 @@ exports.complianceConditionsToBtreeSet = complianceConditionsToBtreeSet;
 /**
  * @hidden
  */
-function toExemptKey(tickerKey, op, claimType) {
-    return { asset: tickerKey, op, claimType };
+function toExemptKey(context, rawAssetId, op, claimType) {
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    if (context.isV6) {
+        return { asset: rawAssetId, op, claimType };
+    }
+    return { assetId: rawAssetId, op, claimType };
 }
 exports.toExemptKey = toExemptKey;
 /**
@@ -3161,13 +3468,17 @@ function inputStatTypeToMeshStatType(input, context) {
     if (type === types_2.StatType.ScopedCount || type === types_2.StatType.ScopedBalance) {
         claimIssuer = claimIssuerToMeshClaimIssuer(input.claimIssuer, context);
     }
-    return statisticsOpTypeToStatType({ op, claimIssuer }, context);
+    return statisticsOpTypeToStatType({ operationType: op, claimIssuer }, context);
 }
 exports.inputStatTypeToMeshStatType = inputStatTypeToMeshStatType;
 /**
  * @hidden
+ *
+ * @deprecated - should be removed post v7
  */
-function meshProposalStatusToProposalStatus(status, expiry) {
+function meshProposalStatusToProposalStatus(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+status, expiry) {
     const { type } = status;
     switch (type) {
         case 'ActiveOrExpired':
@@ -3186,10 +3497,40 @@ function meshProposalStatusToProposalStatus(status, expiry) {
         case 'Rejected':
             return types_2.ProposalStatus.Rejected;
         default:
-            throw new utils_1.UnreachableCaseError(type);
+            throw new internal_1.PolymeshError({
+                code: types_2.ErrorCode.General,
+                message: 'Unexpected proposal status received',
+                data: { type },
+            });
     }
 }
 exports.meshProposalStatusToProposalStatus = meshProposalStatusToProposalStatus;
+/**
+ * @hidden
+ */
+function meshProposalStateToProposalStatus(status) {
+    let expiry;
+    const { type } = status;
+    switch (type) {
+        case 'Active':
+            expiry = (0, internal_3.optionize)(momentToDate)(status.asActive.until.unwrapOr(null));
+            if (!expiry || expiry > new Date()) {
+                return types_2.ProposalStatus.Active;
+            }
+            else {
+                return types_2.ProposalStatus.Expired;
+            }
+        case 'ExecutionSuccessful':
+            return types_2.ProposalStatus.Successful;
+        case 'ExecutionFailed':
+            return types_2.ProposalStatus.Failed;
+        case 'Rejected':
+            return types_2.ProposalStatus.Rejected;
+        default:
+            throw new utils_1.UnreachableCaseError(type);
+    }
+}
+exports.meshProposalStateToProposalStatus = meshProposalStateToProposalStatus;
 /**
  * @hidden
  */
@@ -3337,38 +3678,6 @@ function portfolioIdStringToPortfolio(id) {
     return { identityId, number: parseInt(number, 10) };
 }
 exports.portfolioIdStringToPortfolio = portfolioIdStringToPortfolio;
-// TODO @prashantasdeveloper Remove after SQ dual version support
-/**
- * @hidden
- */
-function oldMiddlewareInstructionToHistoricInstruction(instruction, context) {
-    /* eslint-disable @typescript-eslint/no-non-null-assertion */
-    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) {
-        typeDetails = {
-            type: types_2.InstructionType.SettleOnAffirmation,
-        };
-    }
-    else {
-        typeDetails = {
-            type: settlementType,
-            endBlock: new bignumber_js_1.default(endBlock),
-        };
-    }
-    return Object.assign(Object.assign({ id: new bignumber_js_1.default(instructionId), blockNumber: new bignumber_js_1.default(blockId), blockHash: hash, status,
-        tradeDate,
-        valueDate }, typeDetails), { memo: memo !== null && memo !== void 0 ? memo : null, venueId: new bignumber_js_1.default(venueId), createdAt: new Date(datetime), legs: legs.map(({ fromId, toId, assetId, amount }) => ({
-            asset: new internal_1.FungibleAsset({ ticker: assetId }, context),
-            amount: new bignumber_js_1.default(amount).shiftedBy(-6),
-            from: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(fromId), context),
-            to: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(toId), context),
-        })) });
-    /* eslint-enable @typescript-eslint/no-non-null-assertion */
-}
-exports.oldMiddlewareInstructionToHistoricInstruction = oldMiddlewareInstructionToHistoricInstruction;
-// Dual version support end
 /**
  * @hidden
  */
@@ -3376,19 +3685,19 @@ function middlewareLegToLeg(leg, context) {
     const { legType, from, fromPortfolio, to, toPortfolio, assetId, ticker, nftIds, amount } = leg;
     if (legType === types_1.LegTypeEnum.Fungible) {
         return {
-            asset: new internal_1.FungibleAsset({ ticker: (0, internal_3.getAssetIdFromMiddleware)({ id: assetId, ticker }) }, context),
+            asset: new internal_1.FungibleAsset({ assetId: (0, internal_3.getAssetIdFromMiddleware)({ id: assetId, ticker }, context) }, context),
             amount: new bignumber_js_1.default(amount).shiftedBy(-6),
             from: middlewarePortfolioToPortfolio({ identityId: from, number: fromPortfolio }, context),
             to: middlewarePortfolioToPortfolio({ identityId: to, number: toPortfolio }, context),
         };
     }
     if (legType === types_1.LegTypeEnum.NonFungible) {
-        const id = (0, internal_3.getAssetIdFromMiddleware)({ id: assetId, ticker });
+        const id = (0, internal_3.getAssetIdFromMiddleware)({ id: assetId, ticker }, context);
         return {
             from: middlewarePortfolioToPortfolio({ identityId: from, number: fromPortfolio }, context),
             to: middlewarePortfolioToPortfolio({ identityId: to, number: toPortfolio }, context),
-            nfts: nftIds.map((nftId) => new internal_1.Nft({ ticker: id, id: new bignumber_js_1.default(nftId) }, context)),
-            asset: new internal_1.NftCollection({ ticker: id }, context),
+            nfts: nftIds.map((nftId) => new internal_1.Nft({ assetId: id, id: new bignumber_js_1.default(nftId) }, context)),
+            asset: new internal_1.NftCollection({ assetId: id }, context),
         };
     }
     // presume off chain
@@ -3500,7 +3809,8 @@ function middlewareAgentGroupDataToPermissionGroup(agentGroupData, context) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         permissionGroupIdentifier = { custom: new bignumber_js_1.default(agentGroup.custom) };
     }
-    const ticker = (0, exports.coerceHexToString)(asset);
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    const ticker = context.isV6 ? (0, exports.coerceHexToString)(asset) : asset;
     return assemblePermissionGroup(permissionGroupIdentifier, ticker, context);
 }
 exports.middlewareAgentGroupDataToPermissionGroup = middlewareAgentGroupDataToPermissionGroup;
@@ -3580,8 +3890,9 @@ function middlewarePermissionsDataToPermissions(permissionsData, context) {
     }
     if (assetsPermissions) {
         assets = {
-            values: [...assetsPermissions].map(ticker => new internal_1.FungibleAsset({ ticker: (0, exports.coerceHexToString)(ticker) }, context)),
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            values: [...assetsPermissions].map(assetId => new internal_1.FungibleAsset(
+            /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+            { assetId: context.isV6 ? (0, exports.coerceHexToString)(assetId) : assetId }, context)),
             type: assetsType,
         };
     }
@@ -3672,9 +3983,11 @@ function middlewareAuthorizationDataToAuthorization(context, type, data) {
                 value: (0, exports.coerceHexToString)(data),
             };
         case types_1.AuthTypeEnum.TransferAssetOwnership: {
+            /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+            const value = context.isV6 ? (0, exports.coerceHexToString)(data) : data;
             return {
                 type: types_2.AuthorizationType.TransferAssetOwnership,
-                value: (0, exports.coerceHexToString)(data),
+                value,
             };
         }
         case types_1.AuthTypeEnum.PortfolioCustody: {
@@ -3707,22 +4020,34 @@ exports.collectionKeysToMetadataKeys = collectionKeysToMetadataKeys;
 /**
  * @hidden
  */
-function meshMetadataKeyToMetadataKey(rawKey, ticker) {
-    if (rawKey.isGlobal) {
-        return { type: types_2.MetadataType.Global, id: u64ToBigNumber(rawKey.asGlobal) };
-    }
-    else {
-        return { type: types_2.MetadataType.Local, id: u64ToBigNumber(rawKey.asLocal), ticker };
-    }
+function meshMetadataKeyToMetadataKey(rawKey, asset, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (rawKey.isGlobal) {
+            return { type: types_2.MetadataType.Global, id: u64ToBigNumber(rawKey.asGlobal) };
+        }
+        else {
+            const assetIdParams = yield (0, internal_3.getAssetIdAndTicker)(asset.id, context);
+            return Object.assign({ type: types_2.MetadataType.Local, id: u64ToBigNumber(rawKey.asLocal) }, assetIdParams);
+        }
+    });
 }
 exports.meshMetadataKeyToMetadataKey = meshMetadataKeyToMetadataKey;
 /**
  * @hidden
  */
-function meshNftToNftId(rawInfo) {
-    const { ticker: rawTicker, ids: rawIds } = rawInfo;
+function meshNftToNftId(rawInfo, context) {
+    let rawTicker;
+    let rawIds;
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    if (context.isV6) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ({ ticker: rawTicker, ids: rawIds } = rawInfo); // NOSONAR
+    }
+    else {
+        ({ assetId: rawTicker, ids: rawIds } = rawInfo);
+    }
     return {
-        ticker: tickerToString(rawTicker),
+        assetId: meshAssetToAssetId(rawTicker, context),
         ids: rawIds.map(rawId => u64ToBigNumber(rawId)),
     };
 }
@@ -3768,11 +4093,11 @@ function portfolioMovementsToHistoricSettlements(portfolioMovements, context, ha
         return {
             blockNumber: new bignumber_js_1.default(blockId),
             blockHash: hash,
-            status: typesV6_1.SettlementResultEnum.Executed,
+            status: types_1.InstructionStatusEnum.Executed,
             accounts: [handleMiddlewareAddress(accountAddress, context)],
             legs: [
                 {
-                    asset: new internal_1.FungibleAsset({ ticker: (0, internal_3.getAssetIdFromMiddleware)(asset) }, context),
+                    asset: new internal_1.FungibleAsset({ assetId: (0, internal_3.getAssetIdFromMiddleware)(asset, context) }, context),
                     amount: new bignumber_js_1.default(amount).shiftedBy(-6),
                     direction: typesV1_1.SettlementDirectionEnum.None,
                     from: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(fromId), context),
@@ -3782,61 +4107,6 @@ function portfolioMovementsToHistoricSettlements(portfolioMovements, context, ha
         };
     });
 }
-// TODO @prashantasdeveloper Remove after SQ dual version support
-/**
- * @hidden
- */
-function oldMiddlewareDataToHistoricalSettlements(settlementsResult, portfolioMovements, filter, context) {
-    let data = [];
-    const getDirection = (fromId, toId) => {
-        const [fromDid] = fromId.split('/');
-        const [toDid] = toId.split('/');
-        const [filterDid, filterPortfolioId] = filter.split('/');
-        if (fromId === toId) {
-            return typesV1_1.SettlementDirectionEnum.None;
-        }
-        if (filterPortfolioId && fromId === filter) {
-            return typesV1_1.SettlementDirectionEnum.Outgoing;
-        }
-        if (filterPortfolioId && toId === filter) {
-            return typesV1_1.SettlementDirectionEnum.Incoming;
-        }
-        if (fromDid === filterDid && toDid !== filterDid) {
-            return typesV1_1.SettlementDirectionEnum.Incoming;
-        }
-        if (toDid === filterDid && fromDid !== filterDid) {
-            return typesV1_1.SettlementDirectionEnum.Outgoing;
-        }
-        return typesV1_1.SettlementDirectionEnum.None;
-    };
-    /* eslint-disable @typescript-eslint/no-non-null-assertion */
-    settlementsResult.forEach(({ settlement }) => {
-        const { createdBlock, result: settlementResult, legs: { nodes: legs }, instructionsByLegSettlementIdAndInstructionId: { nodes: [instruction], }, } = settlement;
-        const { id: instructionId } = instruction;
-        const { blockId, hash } = createdBlock;
-        data.push({
-            blockNumber: new bignumber_js_1.default(blockId),
-            blockHash: hash,
-            status: settlementResult,
-            accounts: legs[0].addresses.map((accountAddress) => new internal_1.Account({ address: keyToAddress(accountAddress, context) }, context)),
-            instruction: new internal_1.Instruction({ id: new bignumber_js_1.default(instructionId) }, context),
-            legs: legs.map(({ fromId, toId, assetId, amount }) => ({
-                asset: new internal_1.FungibleAsset({ ticker: assetId }, context),
-                amount: new bignumber_js_1.default(amount).shiftedBy(-6),
-                direction: getDirection(fromId, toId),
-                from: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(fromId), context),
-                to: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(toId), context),
-            })),
-        });
-    });
-    data = [
-        ...data,
-        ...portfolioMovementsToHistoricSettlements(portfolioMovements, context, (accountAddress) => new internal_1.Account({ address: keyToAddress(accountAddress, context) }, context)),
-    ];
-    /* eslint-enable @typescript-eslint/no-non-null-assertion */
-    return data.sort((a, b) => a.blockNumber.minus(b.blockNumber).toNumber());
-}
-exports.oldMiddlewareDataToHistoricalSettlements = oldMiddlewareDataToHistoricalSettlements;
 /**
  * @hidden
  */
@@ -3868,7 +4138,7 @@ function toHistoricalSettlements(settlementsResult, portfolioMovements, filter,
         data.push({
             blockNumber: new bignumber_js_1.default(blockId),
             blockHash: hash,
-            status: status,
+            status,
             accounts: legs[0].addresses.map((address) => new internal_1.Account({ address }, context)),
             instruction: new internal_1.Instruction({ id: new bignumber_js_1.default(id) }, context),
             legs: legs.map(leg => (Object.assign(Object.assign({}, middlewareLegToLeg(leg, context)), { direction: getDirection(leg) }))),